From 89787a4ad82bfc225ca463f13a056b901f0af9d9 Mon Sep 17 00:00:00 2001
From: JiangPeng <jp18752920760@163.com>
Date: Mon, 9 Jan 2023 09:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=90=8C?=
 =?UTF-8?q?=E4=B8=80=E4=BB=93=E5=BA=93=E5=8D=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                     |  4 +---
 .idea/runConfigurations.xml                          | 12 ------------
 .../icspda/activity/TransferWarehouseActivity.java   |  6 ++++++
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

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 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -14,8 +14,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ 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++);