From 13fdee29571421d547469d27aa51c9771e7188d1 Mon Sep 17 00:00:00 2001
From: mao <1205395967@qq.com>
Date: Mon, 7 Jun 2021 14:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icspda/activity/WXItemInActivity.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/icssoft/icspda/activity/WXItemInActivity.java b/app/src/main/java/com/icssoft/icspda/activity/WXItemInActivity.java
index 7ab5560..f7e172d 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/WXItemInActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/WXItemInActivity.java
@@ -3,6 +3,7 @@ package com.icssoft.icspda.activity;
 import android.content.BroadcastReceiver;
 import android.content.DialogInterface;
 import android.graphics.Color;
+import android.graphics.Path;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -65,6 +66,7 @@ public class WXItemInActivity extends AppCompatActivity {
     private String selectRowInvCode = "";
     private String ErrorMsg = "";
     private String StorageCode;
+    String OpCode="";
     private long[] mHits = new long[2];//存储时间的数组
 
 
@@ -278,11 +280,16 @@ public class WXItemInActivity extends AppCompatActivity {
     }
 
     private void AddWXItemInList(){
+        for (WXItemInData wxItemInData:dataList){
+            String a=wxItemInData.getItemCode();
+            String b=a.substring(a.indexOf("-")+1);
+            OpCode="'"+b+"'";
+        }
         Map params = new HashMap();
         params.put("BinCode", "mo-ceshi2");
         params.put("RCVCode", transferNo.getText().toString().trim());
         params.put("ItemLot", wbarCode.getText().toString().trim());
-        params.put("OpCode", "'TD-B002_20'");
+        params.put("OpCode", OpCode);
         params.put("UserCode", LoginActivity.user.getUserCode());
         params.put("UserName", LoginActivity.user.getUserName());
         params.put("WorkPointCode", LoginActivity.user.getWorkPointCode());
@@ -290,13 +297,9 @@ public class WXItemInActivity extends AppCompatActivity {
             result = "";
             result = WebServiceUtil.GetWSReturnInfo("AddWXItemInList", params);
             applicationModel = new Gson().fromJson(result, ApplicationModel.class);
-            if (applicationModel.getCode().equals("1")) {
-//                ErrorMsg="委外收货已确认!";
-//                if (dataList.size()!=0 && dataList!=null){
-//                    dataList.clear();
-//                }
-                GetWXItemInDetail();
+            if (applicationModel.getCode().equals("0")) {
                 handler.sendEmptyMessage(6);
+//                GetWXItemInDetail();
 //                ErrorMsg=applicationModel.getMsg();
 
 
@@ -305,7 +308,7 @@ public class WXItemInActivity extends AppCompatActivity {
 //                gridBarCode();
             }else {
                 ErrorMsg=applicationModel.getMsg();
-                if (ErrorMsg.equals("委外收货已确认")){
+                if (ErrorMsg.equals("条码检验合格后才能入库")){
                     handler.sendEmptyMessage(3);
                     return;
                 }