diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java index c2472927..592483d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java @@ -222,7 +222,6 @@ public class InbillServiceImpl { if (dtl_rows.size() == 0) { JSONObject data = new JSONObject(); data.put("iostorinv_id", dtl_row.getString("iostorinv_id")); - data.put("iostorinvdis_id", dis_row.getString("iostorinvdis_id")); this.confirmMst(data); } } @@ -239,7 +238,6 @@ public class InbillServiceImpl { WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); //库存表 WQLObject redTab = WQLObject.getWQLObject("MD_PB_BucketRecord"); //桶记录表 String iostorinv_id = from.getString("iostorinv_id"); - String iostorinvdis_id = from.getString("iostorinvdis_id"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getNickName(); @@ -255,13 +253,8 @@ public class InbillServiceImpl { if (dtl_rows.size() > 0) { throw new BadRequestException("主表下存在未完成的明细!"); } - JSONArray dis_rows; //更新目的点位,仓位、加库存 - if (StringUtils.isNotEmpty(iostorinvdis_id)){ - dis_rows = dis_table.query("iostorinvdis_id = '" + iostorinvdis_id + "'").getResultJSONArray(0); - }else { - dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); - } + JSONArray dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); for (int i = 0; i < dis_rows.size(); i++) { JSONObject dis_row = dis_rows.getJSONObject(i); JSONObject point_form = new JSONObject(); diff --git a/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue index 7dc37945..0c9d92dc 100644 --- a/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue +++ b/mes/qd/src/views/wms/st/core/outbill/handoutbill/AddDialog.vue @@ -387,8 +387,8 @@ export default { }, tableChanged2(row) { for (let i = 0; i < this.form.tableData.length; i++) { - if (this.form.tableData[i].material_id === row.material_id && this.form.tableData[i].pcsn === row.pcsn) { - this.crud.notify('不允许添加批次相同物料!!') + if (this.form.tableData[i].material_id === row.material_id) { + this.crud.notify('不允许添加相同物料!') return false } } @@ -437,12 +437,6 @@ export default { return false } for (let i = 0; i < this.form.tableData.length; i++) { - for (let j = i+1; j < this.form.tableData.length; j++) { - if (this.form.tableData[i].material_id === this.form.tableData[j].material_id && this.form.tableData[i].pcsn === this.form.tableData[j].pcsn) { - this.crud.notify('不允许添加相同批次物料!', CRUD.NOTIFICATION_TYPE.INFO) - return false - } - } if (!this.form.tableData[i].edit) { this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + ',请检查!') return false