From 776823c8ceb3fd05976786b803ec051e509a9e9b Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 30 Apr 2026 16:15:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=8C=E6=9C=9FPC=E7=AB=AF=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorInv/impl/StIvtIostorinvdtlServiceImpl.java | 4 ++-- .../service/impl/CheckOutBillServiceImpl.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java index 0ce9ddbf6..fe2886af7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java @@ -125,8 +125,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("is_overdue", whereJson.getString("is_overdue")); + mstTab.update(map, "iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'"); // 计算超期数量 List disList = disTab.query("iostorinvdtl_id = '" + whereJson.getString("iostorinvdtl_id") + "' AND is_overdue = '1'") @@ -1220,6 +1221,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { .map(row -> row.getDoubleValue("plan_qty")) .reduce(Double::sum).orElse(0.00); + jsonMst.put("is_overdue", whereJson.getString("is_overdue")); JSONObject result = new JSONObject(); result.put("overdue_qyt", overdue_qyt); result.put("mst", jsonMst); @@ -1262,7 +1264,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } // 根据交货单找到主单据 - JSONObject jsonMst = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag","22").addParam("vbeln",vbeln).process().uniqueResult(0); + JSONObject jsonMst = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "22").addParam("vbeln", vbeln).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonMst)) { continue; } @@ -3247,12 +3249,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONArray structArr = WQLObject.getWQLObject("ST_IVT_StructAttr").query("block_num = '" + jsonRow.getString("block_num") + "' and row_num = '" + jsonRow.getString("row_num") + "' and is_used = '1' and is_delete = '0' and lock_type not in ('1','6','3')").getResultJSONArray(0); if (ObjectUtil.isNotEmpty(structArr)) { - throw new BadRequestException("有仓位被其他业务锁定,仓位编码为【"+structArr.getJSONObject(0).getString("struct_code")+"】,对应单据号为【" + structArr.getJSONObject(0).getString("inv_code") + "】,请稍后在试!"); + throw new BadRequestException("有仓位被其他业务锁定,仓位编码为【" + structArr.getJSONObject(0).getString("struct_code") + "】,对应单据号为【" + structArr.getJSONObject(0).getString("inv_code") + "】,请稍后在试!"); } } } // 1.判断此条分配明细的 ‘仓位’在此主表下的分配明细是否有相同的 ‘仓位’ - List structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id"),whereJson.getString("iostorinvdtl_id")); + List structSet = iStIvtIostorinvdisService.getDisStructSet(whereJson.getString("iostorinv_id"), whereJson.getString("iostorinvdtl_id")); //同区同排排序:10302-04-01 //口口回口回口口口1 //口口回回口口口口2