ldj WMS
This commit is contained in:
parent
ff91693185
commit
d1a17b9f05
|
@ -23,8 +23,8 @@ android {
|
|||
applicationId "com.deiniu.wms"
|
||||
minSdkVersion 19 //target 19 Android 4.4 以下版本仅占比4.1%
|
||||
targetSdkVersion 33
|
||||
versionCode 92
|
||||
versionName "v1.92"
|
||||
versionCode 94
|
||||
versionName "v1.94"
|
||||
|
||||
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -274,13 +274,15 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
validDate.setText(mStockOutPort().getValidDate());
|
||||
batch.setText(mStockOutPort().getBatch());
|
||||
tvCount.setText(mStockOutPort().getPcs()==0?mStockOutPort().getCount()+"" : mStockOutPort().getPcs()+"");
|
||||
tvCount.setText( mStockOutPort().getCount() +"");
|
||||
|
||||
unit.setText(mStockOutPort().getUnit());
|
||||
//packcnt.setText( mStockOutPort().getPcs() +"");
|
||||
packcnt.setText( mStockOutPort().getMinOperateCount() +"");
|
||||
// tvTranArea.setText(mStockOutPort().getTranAreaName());
|
||||
tvTranArea.setText(mStockOutPort().getTranAreaName() + " " + mStockOutPort().getTranLocationId());
|
||||
tvMinOperationUnit.setText(mStockOutPort().getPickUnit() );
|
||||
// tvMinOperationUnit2.setText(mStockOutPort().getUnit() );
|
||||
// tvMinOperationUnit.setText(mStockOutPort().getPickUnit() );
|
||||
tvMinOperationUnit.setText(mStockOutPort().getUnit() );
|
||||
tvMinOperationUnit2.setText(mStockOutPort().getPickUnit() );
|
||||
edTaskId.setText(mStockOutPort().getId());
|
||||
//edLoc.setEnabled(mStockOutPort().getPickState()== Enums.enumPickState.未拣);
|
||||
|
@ -294,15 +296,45 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
if( !TextUtils.isEmpty(mStockOutPort().getId()) )
|
||||
{
|
||||
|
||||
edPickcnt.setText(mStockOutPort().getPcs()+""); //
|
||||
|
||||
|
||||
boolean isweight =isWeighUnit(mStockOutPort().getPickUnit());
|
||||
int pcs = mStockOutPort().getPcs()*100;
|
||||
float minO =mStockOutPort().getMinOperateCount()*100;
|
||||
float r = (pcs*minO)/10000;
|
||||
float cnt = mStockOutPort().getCount();
|
||||
float bulk= cnt -r;
|
||||
edBulk.setText( bulk+"") ;
|
||||
|
||||
if (isweight) {
|
||||
llbatch.setVisibility(View.GONE);
|
||||
llbulk.setVisibility(View.VISIBLE);
|
||||
|
||||
edBulk.setText(mStockOutPort().getCount()+"") ;
|
||||
}else{
|
||||
|
||||
edPickcnt.setText(mStockOutPort().getPcs()+""); //
|
||||
|
||||
edBulk.setText( bulk+"") ;
|
||||
// edPickcnt.setText(r+"");
|
||||
if(r>0){
|
||||
|
||||
llbatch.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
llbatch.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
if(bulk>0){
|
||||
llbulk.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
llbulk.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
llbatch.setVisibility(View.GONE);
|
||||
boolean isweight =isWeighUnit(mStockOutPort().getUnit());
|
||||
|
||||
if(!mStockOutPort().getUnit().equalsIgnoreCase(mStockOutPort().getPickUnit())){
|
||||
|
@ -314,6 +346,8 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
}else{ //分拣单位和库存单位一致,且不为斤
|
||||
llbulk.setVisibility(View.GONE);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
if(!lastCustomerId.equalsIgnoreCase( mStockOutPort().getCustomerId())){
|
||||
edFlowNo.setText("");
|
||||
|
@ -323,7 +357,8 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
// edLoc.setEnabled(true);
|
||||
|
||||
if( !TextUtils.isEmpty( mStockOutPort().getCustomerId() ) &&connectBlueWeight(edBulk,mStockOutPort().getPickUnit(),edFlowNo) ){
|
||||
edPickcnt.setText("0"); //
|
||||
// edPickcnt.setText("0");
|
||||
edBulk.setText(mStockOutPort().getCount()+"");
|
||||
edLoc.setText(mStockOutPort().getLocationId()); //货位分蔬菜。。
|
||||
|
||||
|
||||
|
@ -338,6 +373,7 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
}
|
||||
// edPickcnt.setText(mStockOutPort().getCount()+"");
|
||||
|
||||
/*
|
||||
if(mStockOutPort().getPcs()>0) {
|
||||
llbatch.setVisibility(View.VISIBLE);
|
||||
if (bulk == 0) {
|
||||
|
@ -346,6 +382,7 @@ public class StockOutPickOneByOne extends BasicFragment {
|
|||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if(bulk>0){
|
||||
llbulk.setVisibility(View.VISIBLE);
|
||||
|
|
|
@ -322,6 +322,7 @@ public class StockPandianItemNew_fragment extends BasicFragment {
|
|||
if(rtFlg){
|
||||
clearData();
|
||||
edBarcode.requestFocus();
|
||||
popBack();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -380,23 +380,28 @@ android:padding="3dp"
|
|||
android:layout_marginTop="@dimen/_10dp"
|
||||
>
|
||||
|
||||
|
||||
<Button
|
||||
|
||||
android:id="@+id/btnAdd"
|
||||
style="@style/buttonCates.confirm"
|
||||
android:layout_height="34dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginRight="50dp"
|
||||
android:text="@string/newRec" />
|
||||
|
||||
|
||||
|
||||
<Button
|
||||
|
||||
android:id="@+id/btnConfirm"
|
||||
style="@style/buttonCates.confirm"
|
||||
android:layout_height="34dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginLeft="50dp"
|
||||
android:text="@string/confirm" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
|
@ -128,7 +128,7 @@
|
|||
<item name="android:layout_marginLeft">@dimen/_20dp</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<item name="android:background">@color/lightblue</item>
|
||||
<item name="android:background">@color/steelblue</item>
|
||||
|
||||
</style>
|
||||
<style name="buttonCates.big">
|
||||
|
|
Loading…
Reference in New Issue