From dffe718aff48eba1ec67a01a718631890128e2e2 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 14 Nov 2022 13:57:58 +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 --- .../org/nl/modules/common/utils/SecurityUtils.java | 4 ++++ .../service/impl/CheckOutBillServiceImpl.java | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java index eca9afc83..c97afd49f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java @@ -7,6 +7,8 @@ import cn.hutool.json.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.utils.dto.CurrentUser; import org.nl.modules.system.service.dto.UserDto; +import org.nl.modules.system.service.impl.UserServiceImpl; +import org.nl.modules.wql.util.SpringContextHolder; import java.util.List; @@ -34,6 +36,8 @@ public class SecurityUtils { currentUser.setId((long) 2); currentUser.setNickName("默认用户"); currentUser.setUsername("default"); + UserDto userDto = SpringContextHolder.getBean(UserServiceImpl.class).findById(2); + currentUser.setUser(userDto); return currentUser; } return null; 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 3acd89139..e33db9ac5 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 @@ -446,7 +446,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("flag", "1"); 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("sect_id", RegionTypeEnum.ZC01.getId()); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); @@ -655,7 +655,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonMap.put("flag", "1"); 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("sect_id", RegionTypeEnum.ZC01.getId()); JSONObject jsonOneIvt = WQL.getWO("ST_OUTIVT01").addParamMap(jsonMap).process().uniqueResult(0); if (ObjectUtil.isEmpty(jsonOneIvt)) throw new BadRequestException("库存不足"); @@ -1804,10 +1804,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonDis.put("work_status", "99"); wo_dis.update(jsonDis); - // 更新明细为完成 + // 判断此明细下是否还有未完成的分配明细 JSONObject jsonDtl = wo_dtl.query("iostorinvdtl_id = '" + jsonDis.getString("iostorinvdtl_id") + "'").uniqueResult(0); - jsonDtl.put("bill_status", "99"); - wo_dtl.update(jsonDtl); + JSONArray disArr2 = wo_dis.query("iostorinvdtl_id = '" + jsonDtl.getString("iostorinvdtl_id") + "' and work_status <> '99'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(disArr2)) { + // 更新明细为完成 + jsonDtl.put("bill_status", "99"); + wo_dtl.update(jsonDtl); + } } //判断是否还有未完成的明细