diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index f2906203d..a6bcc7937 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -771,6 +771,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("sale_order_name", dtl.getString("source_bill_code")); jsonMap.put("sect_id", whereJson.getString("sect_id")); + jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); @@ -849,6 +850,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("pcsn", dtl.getString("pcsn")); jsonMap.put("sect_id", whereJson.getString("sect_id")); + jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不足"); @@ -988,6 +990,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("sale_order_name", dtl.getString("source_bill_code")); jsonMap.put("sect_id", whereJson.getString("sect_id")); + jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); @@ -1066,6 +1069,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("material_id", dtl.getString("material_id")); jsonMap.put("pcsn", dtl.getString("pcsn")); jsonMap.put("sect_id", whereJson.getString("sect_id")); + jsonMap.put("stor_id", whereJson.getString("stor_id")); JSONObject jsonIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不足"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql index 272b81076..1fd2d7823 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql @@ -23,6 +23,7 @@ 输入.pcsn TYPEAS s_string 输入.iostorinv_id TYPEAS s_string 输入.iostorinvdtl_id TYPEAS s_string + 输入.stor_id TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -84,6 +85,10 @@ ivt.pcsn = 输入.pcsn ENDOPTION + OPTION 输入.stor_id <> "" + attr.stor_id = 输入.stor_id + ENDOPTION + order by ivt.instorage_time ASC ENDSELECT diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 04d57efae..8a4615a59 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -304,7 +304,7 @@ export default { rowmst: { handler(newValue, oldValue) { this.mstrow = newValue - this.mstrow.stor_id = '' + // this.mstrow.stor_id = '' } } }, @@ -447,20 +447,20 @@ export default { } }, allDiv() { - if (!this.mstrow.sect_id) { - this.crud.notify('请先选择库区!', CRUD.NOTIFICATION_TYPE.INFO) - return - } + // if (!this.mstrow.sect_id) { + // this.crud.notify('请先选择库区!', CRUD.NOTIFICATION_TYPE.INFO) + // return + // } checkoutbill.allDiv(this.mstrow).then(res => { this.crud.notify('分配成功!', CRUD.NOTIFICATION_TYPE.INFO) this.queryTableDtl() }) }, oneDiv() { - if (!this.mstrow.sect_id) { - this.crud.notify('请先选择库区!', CRUD.NOTIFICATION_TYPE.INFO) - return - } + // if (!this.mstrow.sect_id) { + // this.crud.notify('请先选择库区!', CRUD.NOTIFICATION_TYPE.INFO) + // return + // } if (this.currentRow.iostorinvdtl_id !== null) { this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id checkoutbill.allDivOne(this.mstrow).then(res => {