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 eb5d598..7f8e0c7 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/INVTransInActivity.java @@ -65,6 +65,7 @@ public class INVTransInActivity extends AppCompatActivity { private String WhCode; private String ToWhCode; private Double limitQty; + private String StorageCode; private long[] mHits = new long[2];//存储时间的数组 //endregion @@ -73,13 +74,13 @@ public class INVTransInActivity extends AppCompatActivity { public void handleMessage(Message msg) { super.handleMessage(msg); switch (msg.what) { - case 0: - dataList.clear(); - dataDetailList.clear(); - gridBarCode(); - toBin.requestFocus(); - HelpUtil.SetMsg(tvMsg, Color.BLUE, "源头单据扫描成功!"); - break; +// case 0: +//// dataList.clear(); +//// dataDetailList.clear(); +//// gridBarCode(); +// barCode.requestFocus(); +// HelpUtil.SetMsg(tvMsg, Color.BLUE, "源头单据扫描成功!"); +// break; // case 1: // HelpUtil.SetMsg(tvMsg, Color.RED, ErrorMsg); // transferNo.postDelayed(new Runnable() { @@ -111,7 +112,7 @@ public class INVTransInActivity extends AppCompatActivity { barCode.requestFocus(); HelpUtil.SetMsg(tvMsg, Color.BLUE, "调拨数量记录成功!"); break; - case 7: + case 0: HelpUtil.SetMsg(tvMsg,Color.BLUE,"库位条码扫描成功!"); barCode.postDelayed(new Runnable() { @Override @@ -415,18 +416,22 @@ public class INVTransInActivity extends AppCompatActivity { result = WebServiceUtil.GetWSReturnInfo("CheckStackCode", params); if (result != null && result.length() != 0) { applicationModel = new Gson().fromJson(result, ApplicationModel.class); - if (applicationModel.getCode().equals("0")) { - for (LotDetail lot:lotDetails){ - if (!applicationModel.getData().equals(lot.getWHCode())) { - ErrorMsg = "目标库位与源头单据不符,请确认后重新扫描!"; - handler.sendEmptyMessage(2); - } else { - handler.sendEmptyMessage(7); - } - } + int code = Integer.parseInt(applicationModel.getCode()); + if (code==0) { +// if (!applicationModel.getData().equals(ToWhCode)) { +// ErrorMsg = "目标库位与源头单据不符,请确认后重新扫描!"; +// handler.sendEmptyMessage(2); +// } else { +// handler.sendEmptyMessage(7); +// } + StorageCode=applicationModel.getData(); + handler.sendEmptyMessage(code); } else { - ErrorMsg = "库位条码不存在!"; +// ErrorMsg = "库位条码不存在!"; +// handler.sendEmptyMessage(2); + ErrorMsg = applicationModel.getMsg(); handler.sendEmptyMessage(2); + return; } } } catch (Exception ex) {