diff --git a/app/src/main/java/com/icssoft/icspda/activity/OtherOutActivity.java b/app/src/main/java/com/icssoft/icspda/activity/OtherOutActivity.java index 9bb326c..3edb3cb 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/OtherOutActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/OtherOutActivity.java @@ -157,7 +157,7 @@ public class OtherOutActivity extends AppCompatActivity { HelpUtil.SetMsg(tvMsg, Color.RED, ErrorMsg); break; case 100: - tableData = new TableData<>("采购退货信息", dataList, columns); + tableData = new TableData<>("其他出库", dataList, columns); smartTable.setTableData(tableData); HelpUtil.SetMsg(tvMsg, Color.BLUE, "移出成功"); barCode.postDelayed(new Runnable() { @@ -561,9 +561,9 @@ public class OtherOutActivity extends AppCompatActivity { } for (ItemLotDetailData pd : dataDetailList) { - if (barCode.getText().toString().toUpperCase().equals(pd.getLotNo().toUpperCase())) { - lotExist = true; - } +// if (barCode.getText().toString().toUpperCase().equals(pd.getLotNo().toUpperCase())) { +// lotExist = true; +// } if (pd.getLotNo().toUpperCase().equals(lot.getLotNo().toUpperCase())) { ErrorMsg = "条码已经扫入,请勿重复扫描!"; handler.sendEmptyMessage(3); @@ -572,18 +572,18 @@ public class OtherOutActivity extends AppCompatActivity { } if (!isExist) { - if (!lotExist){ - ItemLotDetailData itemLotDetailData = new ItemLotDetailData(); - itemLotDetailData.setVouchRow("0"); - itemLotDetailData.setLotNo(lot.getLotNo()); - itemLotDetailData.setInvCode(lot.getInvCode()); - itemLotDetailData.setInvName(lot.getInvName()); - itemLotDetailData.setLotQty(lot.getLotQty() + ""); - itemLotDetailData.setCurrentQty("0.00"); - itemLotDetailData.setOrderNo(lot.getOrderNo()); - itemLotDetailData.setBatch(lot.getBatch()); - dataDetailList.add(itemLotDetailData); - } +// if (!lotExist){ +// ItemLotDetailData itemLotDetailData = new ItemLotDetailData(); +// itemLotDetailData.setVouchRow("0"); +// itemLotDetailData.setLotNo(lot.getLotNo()); +// itemLotDetailData.setInvCode(lot.getInvCode()); +// itemLotDetailData.setInvName(lot.getInvName()); +// itemLotDetailData.setLotQty(lot.getLotQty() + ""); +// itemLotDetailData.setCurrentQty("0.00"); +// itemLotDetailData.setOrderNo(lot.getOrderNo()); +// itemLotDetailData.setBatch(lot.getBatch()); +// dataDetailList.add(itemLotDetailData); +// } ErrorMsg = lot.getLotQty() + ""; handler.sendEmptyMessage(11); @@ -644,9 +644,6 @@ public class OtherOutActivity extends AppCompatActivity { } } } - // barCode.requestFocus(); - ErrorMsg = "已移除!"; - handler.sendEmptyMessage(3); } } catch (Exception ex) { ErrorMsg = ex.getMessage(); @@ -661,6 +658,13 @@ public class OtherOutActivity extends AppCompatActivity { try { result = ""; result = WebServiceUtil.GetWSReturnInfo("GetLotDataForOtherOut", params); +// if (result.equals("{[]}")){ +// ErrorMsg = "条码不存在!"; +// handler.sendEmptyMessage(3); +// return; +// }else { +// GetLotData(); +// } } catch (Exception ex) { ErrorMsg = ex.getMessage(); handler.sendEmptyMessage(99);