diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ed9c379..7ab7fbd 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file 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 9922b97..37e7276 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/TransferWarehouseActivity.java @@ -414,6 +414,12 @@ public class TransferWarehouseActivity extends AppCompatActivity { handler.sendEmptyMessage(3); return; } + if (!WhDataList.get(0).getWarehouseCode().equals(lot.getWarehouseCode())){ + ErrorMsg = "移位操作只能在同一仓库内进行!"; + handler.sendEmptyMessage(3); + return; + } + //给主表增加一条数据 Data row = new Data(); row.setCount(count++);