From 9d3c00b5fc7a755f18b6de94c55000e792b269c2 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 18 Oct 2022 10:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/impl/InbillServiceImpl.java | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java index 2ba961c9..18c34a98 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java @@ -10,6 +10,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; import org.nl.utils.SecurityUtils; +import org.nl.wms.pcs.Enum.ProcStatusEnum; +import org.nl.wms.pcs.Enum.ReceiveStatusEnum; import org.nl.wms.st.core.service.StorPublicService; import org.nl.wql.core.bean.WQLObject; import org.springframework.beans.factory.annotation.Autowired; @@ -225,6 +227,10 @@ public class InbillServiceImpl { WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); WQLObject bucket_table = WQLObject.getWQLObject("md_pb_bucketrecord"); + WQLObject reMstTab = WQLObject.getWQLObject("PCS_RC_ReceiveMst"); //到货通知单主表 + WQLObject reDtlTab = WQLObject.getWQLObject("PCS_RC_ReceiveDtl"); //到货通知单明细表 + WQLObject procTab = WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc"); //采购订单接口处理表 + WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_InspectionSheetDtl"); //质检单明细表 String iostorinv_id = from.getString("iostorinv_id"); Long currentUserId = SecurityUtils.getCurrentUserId(); @@ -280,11 +286,81 @@ public class InbillServiceImpl { bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'"); //如果单据为原辅料入库,且为寄样合格,回写到货通知单 + } mst_jo.put("bill_status", "99"); mst_jo.put("confirm_optid", currentUserId); mst_jo.put("confirm_optname", nickName); mst_jo.put("confirm_time", now); + if("000101".equals(bill_type)){ + //查询 + dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status = '99'").getResultJSONArray(0); + + for(int i=0; i= jsonProc.getDoubleValue("qty")) && (StrUtil.equals(jsonReDtl.getString("status"), "99"))) { + jsonProc.put("proc_status", ProcStatusEnum.FULFILL.getCode()); + } else { + jsonProc.put("proc_status", ProcStatusEnum.BUYING_CENTER.getCode()); + } + procTab.update(jsonProc); + } + } + } + } + //更新主表状态为99 WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); }