From 2874adc42c378805bba7a173f4d1b85363e53507 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 17 Nov 2022 10:33:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 290304 -> 290816 bytes .../mes/service/impl/LmsToMesServiceImpl.java | 6 +-- .../service/impl/PointStatusServiceImpl.java | 19 +++++++ .../impl/ProductInstorServiceImpl.java | 49 ++++++++++++++++++ .../org/nl/wms/sch/tasks/CoolCutTask.java | 23 ++++++++ .../service/impl/InbillServiceImpl.java | 2 +- .../rest/InAndOutReturnlController.java | 2 +- .../service/InAndOutReturnService.java | 2 +- .../impl/InAndOutRetrunServiceImpl.java | 7 +-- 9 files changed, 101 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index d0ba54926c75d4a3bbbc7e77370c87a51af20f1f..9180cef9d4590b0d7c6381a4e2a185a256b932df 100644 GIT binary patch delta 24102 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 Ef4~((-Fn?D*z56A!+|k69{Fj!O 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 map = new HashMap<>(); + map.put("is_parent_ok","1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"parent_container_name = '"+container_name+"'"); + + //回传MES + JSONObject mom_jo = new JSONObject(); + mom_jo.put("contain_name",container_name); + mom_jo.put("warehouse","1"); + lmsToMesService.cutPlanMomRollDeliveryComplete(mom_jo); + } } //2-解绑 if (option.equals("2")) { 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 dcbcaa713..2aa4bc00a 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 @@ -3,10 +3,12 @@ package org.nl.wms.pda.st.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -16,6 +18,7 @@ import org.nl.wms.pda.st.service.ProductInstorService; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.tasks.InTask; import org.nl.wms.st.inbill.service.RawAssistIStorService; +import org.nl.wms.st.inbill.service.StorPublicService; import org.nl.wms.st.inbill.service.impl.InbillServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +40,8 @@ public class ProductInstorServiceImpl implements ProductInstorService { private final RawAssistIStorService rawAssistIStorService; + private final StorPublicService storPublicService; + @Override public JSONObject boxQuery(JSONObject whereJson) { String box_no = whereJson.getString("box_no"); @@ -82,6 +87,9 @@ public class ProductInstorServiceImpl implements ProductInstorService { WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_map, "package_box_SN = '" + box_no + "'"); } + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + //如果是入虚拟库直接入库并确认，如果是入成品库则生成入库单，生成一个二楼去一楼的任务 JSONObject mst_jo = new JSONObject(); mst_jo.put("tableData", box_rows); @@ -122,6 +130,47 @@ public class ProductInstorServiceImpl implements ProductInstorService { WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(dis_map, "iostorinv_id = '" + iostorinv_id + "'"); + //修改库存 + //直接取出入库分配表的库存 + mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + JSONArray dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' AND box_no = '" + map.get("box_no") + "'").getResultJSONArray(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_jo = dis_rows.getJSONObject(i); + JSONObject i_form = new JSONObject(); + i_form.put("struct_id", dis_jo.getString("struct_id")); + i_form.put("material_id", dis_jo.getString("material_id")); + i_form.put("pcsn", dis_jo.getString("pcsn")); + i_form.put("change_qty", dis_jo.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("quality_scode", "01"); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_jo.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_jo.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "31"); + + //更新明细表状态 + JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "'").uniqueResult(0); + if (dtl_jo.getDoubleValue("unassign_qty") == 0) { + //判断该明细下是否还存在未分配货位的分配明细 + JSONArray disdiv_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "' AND (struct_id = '' OR struct_id is null) AND (point_id = '' OR point_id is null)").getResultJSONArray(0); + if (disdiv_rows.size() == 0) { + dtl_jo.put("bill_status", "40"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl_jo); + //判断主表下的明细是否都为40 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + dis_jo.getString("iostorinv_id") + "' AND bill_status < '40'").getResultJSONArray(0); + if (dtl_rows.size() == 0) { + mst_jo.put("bill_status", "40"); + mst_jo.put("dis_optid", currentUserId); + mst_jo.put("dis_optname", nickName); + mst_jo.put("dis_time", DateUtil.now()); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); + } + } + } + } + //调用入库分配确认方法 InbillServiceImpl inbillService = SpringContextHolder.getBean(InbillServiceImpl.class); JSONObject dis_form = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index dd9846b60..8d77e5ebe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -14,6 +14,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.mes.service.LmsToMesService; +import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -159,6 +160,17 @@ public class CoolCutTask extends AbstractAcsTask { jsonCoolIvt2.put("update_optname", currentUsername); jsonCoolIvt2.put("update_time", DateUtil.now()); WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); + + //更新该母卷对应分切计划的状态 + HashMap map = new HashMap<>(); + map.put("is_parent_ok","1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"parent_container_name = '"+container_name+"'"); + + //回传MES + JSONObject mom_jo = new JSONObject(); + mom_jo.put("contain_name",container_name); + mom_jo.put("warehouse","1"); + new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); } if (jsonTask.getString("task_type").equals("010302")) { @@ -190,6 +202,17 @@ public class CoolCutTask extends AbstractAcsTask { cut_jo.put("update_optname", currentUsername); cut_jo.put("update_time", DateUtil.now()); WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); + + //更新该母卷对应分切计划的状态 + HashMap map = new HashMap<>(); + map.put("is_parent_ok","1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"parent_container_name = '"+container_name+"'"); + + //回传MES + JSONObject mom_jo = new JSONObject(); + mom_jo.put("contain_name",container_name); + mom_jo.put("warehouse","1"); + new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); } if (jsonTask.getString("task_type").equals("010303")) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java index 18941c21b..1e73f0ff2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java @@ -134,7 +134,7 @@ public class InbillServiceImpl { } //更新目的点位，仓位、加库存 - JSONArray dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + JSONArray dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "' AND work_status < '99'").getResultJSONArray(0); for (int i = 0; i < dis_rows.size(); i++) { JSONObject dis_row = dis_rows.getJSONObject(i); JSONObject point_form = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java index b4b8bcf45..cb0e1ed37 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java @@ -33,7 +33,7 @@ public class InAndOutReturnlController { @PostMapping("/upload") @Log("回传") @ApiOperation("回传") - public ResponseEntity upload(@RequestBody Map whereJson) { + public ResponseEntity upload(@RequestBody JSONObject whereJson) { inAndOutReturnService.upload(whereJson); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java index 1b2266cb2..b8280d9b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/InAndOutReturnService.java @@ -16,7 +16,7 @@ public interface InAndOutReturnService { */ Map pageQuery(Map whereJson, Pageable page); - void upload(Map whereJson); + void upload(JSONObject whereJson); void uploadMES(Map whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 42ed47be4..a446af22b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -65,7 +66,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } @Override - public void upload(Map whereJson) { + public void upload(JSONObject whereJson) { //出库分配表 WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); //出库明细表 @@ -77,9 +78,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { //根据出入单类型判断回传业务 //1、生产入库：回传MES；手工入库：回传SAP //1、销售出库：回传MES、SAP；改切出库：回传SAP - JSONArray rows = (JSONArray) whereJson.get("rows"); + JSONArray rows = whereJson.getJSONArray("rows"); for (int i = 0; i < rows.size(); i++) { - JSONObject jo_mst = new JSONObject(); + JSONObject jo_mst = rows.getJSONObject(i); String isUpload = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_upload").getValue(); if (StrUtil.equals(isUpload, "1")) { String bill_type = jo_mst.getString("bill_type");