From 674a7cd7fa683bb056933dc7f9ae93b3b7c83646 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 28 Dec 2022 21:45:56 +0800 Subject: [PATCH] =?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 --- .../service/impl/CheckOutBillServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 a6bcc7937..5e762fd0f 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 @@ -1378,6 +1378,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } else { jo_dtl.put("bill_status", "30"); } + + if (jo_dtl.getDoubleValue("unassign_qty") == 0) { + jo_dtl.put("bill_status", "40"); + } + wo_dtl.update(jo_dtl); //更新主表状态 this.updateMststatus(iostorinv_id); @@ -1878,7 +1883,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { assign_qty = NumberUtil.add(assign_qty,canuse_qty); if (unassign_qty >= canuse_qty) { - unassign_qty = unassign_qty - canuse_qty; +// unassign_qty = unassign_qty - canuse_qty; + unassign_qty = NumberUtil.sub(unassign_qty,canuse_qty); ivt.put("change_qty", canuse_qty + ""); } else { ivt.put("change_qty", canuse_qty + ""); @@ -1920,11 +1926,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { break; } } - HashMap map_dtl = new HashMap(); +// HashMap map_dtl = new HashMap(); + JSONObject map_dtl = new JSONObject(); //更新明细 map_dtl.put("unassign_qty", unassign_qty + ""); map_dtl.put("assign_qty", assign_qty + ""); - if (unassign_qty == 0) { + if (map_dtl.getDoubleValue("unassign_qty") <= 0) { map_dtl.put("bill_status", "40"); } else { map_dtl.put("bill_status", "30");