From 0c4a41a1e75e11c1f9148b71b750d12f62b7f637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=B9=8F?= Date: Tue, 23 May 2023 10:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E6=89=AB=E6=8F=8F=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E5=BE=97=E5=88=B0=E4=BB=93=E5=BA=93=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../icssoft/icspda/activity/TransferWarehouseActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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());//目标库位