From e153f97de44f0965bb8bde773c3c4dd1f6dd1274 Mon Sep 17 00:00:00 2001
From: mao <1205395967@qq.com>
Date: Fri, 21 May 2021 14:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=AD=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icspda/activity/INVTransInActivity.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java b/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java
index 05e5245..eb5d598 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java
@@ -112,8 +112,13 @@ public class INVTransInActivity extends AppCompatActivity {
                     HelpUtil.SetMsg(tvMsg, Color.BLUE, "调拨数量记录成功!");
                     break;
                 case 7:
-                    barCode.requestFocus();
                     HelpUtil.SetMsg(tvMsg,Color.BLUE,"库位条码扫描成功!");
+                    barCode.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            barCode.requestFocus();
+                        }
+                    },1000);
                     break;
                 case 6:
                     clear();
@@ -411,11 +416,13 @@ public class INVTransInActivity extends AppCompatActivity {
             if (result != null && result.length() != 0) {
                 applicationModel = new Gson().fromJson(result, ApplicationModel.class);
                 if (applicationModel.getCode().equals("0")) {
-                    if (!applicationModel.getData().equals(ToWhCode)) {
-                        ErrorMsg = "目标库位与源头单据不符，请确认后重新扫描!";
-                        handler.sendEmptyMessage(2);
-                    } else {
-                        handler.sendEmptyMessage(7);
+                    for (LotDetail lot:lotDetails){
+                        if (!applicationModel.getData().equals(lot.getWHCode())) {
+                            ErrorMsg = "目标库位与源头单据不符，请确认后重新扫描!";
+                            handler.sendEmptyMessage(2);
+                        } else {
+                            handler.sendEmptyMessage(7);
+                        }
                     }
                 } else {
                     ErrorMsg = "库位条码不存在!";