diff --git a/app/build.gradle b/app/build.gradle index b1eb171..b8c0afd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android {compileSdkVersion 30 minSdkVersion 18 //noinspection ExpiredTargetSdkVersion targetSdkVersion 28 - versionCode 38 + versionCode 39 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/icssoft/icspda/activity/MOStockINActivity.java b/app/src/main/java/com/icssoft/icspda/activity/MOStockINActivity.java index 3e4be71..80ac31e 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/MOStockINActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/MOStockINActivity.java @@ -454,7 +454,7 @@ public class MOStockINActivity extends AppCompatActivity { private void confirmClick() { for (Data data : dataList) { if (lotMark.equals(data.getTransCode() + data.getTransSequence() + data.getLotNo() + data.getBatchCode())){ - data.setQuantity(et_quantity.getText().toString().trim()); + data.setCurrentQty(et_quantity.getText().toString().trim()); ErrorMsg = "入库数量记录成功!"; handler.sendEmptyMessage(5); break; @@ -663,14 +663,14 @@ public class MOStockINActivity extends AppCompatActivity { for (Data data:dataList){ Map tempDetailMap = new HashMap(); - BigDecimal currQty = new BigDecimal(data.getQuantity()); + BigDecimal currQty = new BigDecimal(data.getCurrentQty()); if (currQty.compareTo(BigDecimal.ZERO) == 1) { tempDetailMap.put("LotNo", data.getLotNo()); tempDetailMap.put("LocationCode", whDatas.get(0).getLocationCode()); tempDetailMap.put("WarehouseCode", whDatas.get(0).getWarehouseCode()); tempDetailMap.put("InvCode", data.getInvCode()); tempDetailMap.put("TransCode",data.getTransCode()); - tempDetailMap.put("Quantity",data.getQuantity()); + tempDetailMap.put("Quantity",data.getCurrentQty()); tempArr.add(tempDetailMap); }else { ErrorMsg = "提交数量不可为0,请确认后再提交";