From 129323c8cc3704f9198ef36334270f02a6322bab Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 9 Dec 2022 13:17:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 be1548df6..24296947e 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 @@ -2088,7 +2088,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // 更新子卷包装关系表 状态 - 3 JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); - jsonSub.put("status", "3"); + // 如果是拆分入库则将包装关系改为生成状态 + if (jo_mst.getString("bill_type").equals("1005")){ + jsonSub.put("status", "0"); + } else { + jsonSub.put("status", "3"); + } subTab.update(jsonSub); } From 9a4e78a5553990228906315f0f278b6e42e099dc Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 9 Dec 2022 13:17:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index c78464a42..354a047ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -80,7 +80,7 @@ public class ProductInstorServiceImpl implements ProductInstorService { @Transactional(rollbackFor = Exception.class) public JSONObject confirm(JSONObject whereJson) { String box_no = whereJson.getString("box_no"); - //1-报废入库；2-生产入库；3-退货入库 + //1-报废入库；2-生产入库；3-退货入库；4-拆分入库 String option = whereJson.getString("option"); String material_code = whereJson.getString("material_code"); String is_virtual = whereJson.getString("is_virtual"); @@ -112,6 +112,9 @@ public class ProductInstorServiceImpl implements ProductInstorService { if (option.equals("3")) { mst_jo.put("bill_type", "0002"); } + if (option.equals("4")) { + mst_jo.put("bill_type", "0005"); + } //查询成品库仓库 JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0); mst_jo.put("stor_id", stor.getString("stor_id"));