diff --git a/app/build.gradle b/app/build.gradle index b3e98dd..b406920 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android {compileSdkVersion 30 applicationId "com.icssoft.icspda" minSdkVersion 18 targetSdkVersion 28 - versionCode 23 + versionCode 26 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java b/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java index 37e7276..2f599e1 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java @@ -414,7 +414,7 @@ public class TransferWarehouseActivity extends AppCompatActivity { handler.sendEmptyMessage(3); return; } - if (!WhDataList.get(0).getWarehouseCode().equals(lot.getWarehouseCode())){ + if (!WhDataList.get(0).getWarehouseCode().equals(lot.getWHCode())){ ErrorMsg = "移位操作只能在同一仓库内进行!"; handler.sendEmptyMessage(3); return; @@ -423,7 +423,7 @@ public class TransferWarehouseActivity extends AppCompatActivity { //给主表增加一条数据 Data row = new Data(); row.setCount(count++); - row.setFromWarehouseCode(lot.getWarehouseCode());//原仓库 + row.setFromWarehouseCode(lot.getWHCode());//原仓库 row.setLocationCode(lot.getLocationCode());//原库位 row.setToWarehouseCode(WhDataList.get(0).getWarehouseCode());//目标仓库 row.setBinCode(WhDataList.get(0).getLocationCode());//目标库位