From 4136c43e60cb555f211631c3c767a9c5bbd1a2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=9E=9D=E5=88=9A?= Date: Thu, 16 Jan 2025 14:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../def/job/SapMaterialConsumptionJob.java | 2 +- .../def/job/SapShopOrderCompleteJob.java | 50 ------------------- .../LotMaterialDealSendSapServiceImpl.java | 8 --- 3 files changed, 1 insertion(+), 59 deletions(-) diff --git a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterialConsumptionJob.java b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterialConsumptionJob.java index 64d6f56..ed22d4b 100644 --- a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterialConsumptionJob.java +++ b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterialConsumptionJob.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; /** - * 101完工入库JOB + * 261物料消耗JOB */ @Component @AllArgsConstructor diff --git a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapShopOrderCompleteJob.java b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapShopOrderCompleteJob.java index e358753..4fe4c65 100644 --- a/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapShopOrderCompleteJob.java +++ b/int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapShopOrderCompleteJob.java @@ -2,20 +2,15 @@ package com.foreverwin.iep.integration.handler.def.job; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.foreverwin.iep.common.faas.common.util.StringUtils; import com.foreverwin.iep.integration.domain.InvokeResponse; -import com.foreverwin.iep.integration.handler.def.sap.GoodMvtCreateService; -import com.foreverwin.iep.integration.handler.def.sap.SapUtil; import com.foreverwin.iep.integration.service.LotMaterialDealSendSapService; import com.foreverwin.iep.integration.utils.JS; import com.foreverwin.iep.prd.entity.ZLotMaterialCompleteTransaction; import com.foreverwin.iep.prd.mapper.ZLotMaterialCompleteTransactionMapper; import com.foreverwin.mom.common.data.tenant.TenantContextHolder; -import com.foreverwin.mom.common.security.util.SecurityUtils; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; @@ -23,7 +18,6 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -36,7 +30,6 @@ import java.util.Map; public class SapShopOrderCompleteJob { private final ZLotMaterialCompleteTransactionMapper zLotMaterialCompleteTransactionMapper; - private final GoodMvtCreateService goodMvtCreateService; private final LotMaterialDealSendSapService lotMaterialDealSendSapService; @XxlJob("sapShopOrderCompleteJobHandler") @@ -94,47 +87,4 @@ public class SapShopOrderCompleteJob { } } - // 凭证中的过账日期 yyyy-MM-dd - private String assembleMaterialMsgBody(JSONArray itemList, String postingDate) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("RFC_FUNCTION", "ZMM_MES_GOODSMVT_CREATE"); - JSONObject headRe = new JSONObject(); - headRe.put("EXCHANGE_SYSTEM", "MES"); - headRe.put("EXCHANGE_ID", SapUtil.generateReqId()); - headRe.put("EXCHANGE_DOC", "iMES_Call_SAP"); - jsonObject.put("REQUEST_CONTEXT", headRe); - JSONObject bodyRe = new JSONObject(); - JSONObject headBody = new JSONObject(); - headBody.put("ZPARTNER", SecurityUtils.getUserName()); // 员工BP编号 - headBody.put("BUDAT", postingDate); // 凭证中的过账日期 - bodyRe.put("IS_HEAD", headBody); - bodyRe.put("IT_ITEM", itemList); - jsonObject.put("REQUEST_BODY", bodyRe); - return jsonObject.toJSONString(); - } - - // 完成后修改结果 - public InvokeResponse updateLotComplete(JSONObject jsonObject, List srcList, - InvokeResponse invokeResponse) { - JSONObject bodyJson = jsonObject.getJSONObject("RESPONSE_BODY"); - JSONObject outJson = bodyJson.getJSONObject("ES_OUTPUT"); - String result = outJson.getString("MSGTY"); - String message = outJson.getString("MSGTX"); - String msgNo = outJson.getString("MSGNO"); - String mblnr = outJson.getString("MBLNR"); // 物料凭证编号 - for (ZLotMaterialCompleteTransaction targetObj : srcList) { - targetObj.setSyncStatus(result); - targetObj.setSyncMsgText(message); - targetObj.setSyncMsgNo(msgNo); - targetObj.setSyncVoucherNo(mblnr); - targetObj.setSyncSubmitter(SecurityUtils.getUserName()); - targetObj.setUpdater(SecurityUtils.getUserName()); - targetObj.setDateUpdate(LocalDateTime.now()); - zLotMaterialCompleteTransactionMapper.updateById(targetObj); - } - invokeResponse.setResult(result); - invokeResponse.setMessageContent(message); - return invokeResponse; - } - } diff --git a/int-core/src/main/java/com/foreverwin/iep/integration/service/impl/LotMaterialDealSendSapServiceImpl.java b/int-core/src/main/java/com/foreverwin/iep/integration/service/impl/LotMaterialDealSendSapServiceImpl.java index 121146a..b18d673 100644 --- a/int-core/src/main/java/com/foreverwin/iep/integration/service/impl/LotMaterialDealSendSapServiceImpl.java +++ b/int-core/src/main/java/com/foreverwin/iep/integration/service/impl/LotMaterialDealSendSapServiceImpl.java @@ -7,17 +7,11 @@ import com.foreverwin.iep.integration.domain.InvokeRequest; import com.foreverwin.iep.integration.domain.InvokeResponse; import com.foreverwin.iep.integration.handler.def.sap.GoodMvtCreateService; import com.foreverwin.iep.integration.handler.def.sap.SapUtil; -import com.foreverwin.iep.integration.handler.def.sap.ShopOrderStatisticTransCancelService; -import com.foreverwin.iep.integration.handler.def.sap.ShopOrderStatisticTransService; -import com.foreverwin.iep.integration.service.IntInDataLogService; -import com.foreverwin.iep.integration.service.IntInDataService; import com.foreverwin.iep.integration.service.LotMaterialDealSendSapService; -import com.foreverwin.iep.integration.service.RegisterDocumentService; import com.foreverwin.iep.prd.entity.ZLotMaterialCompleteTransaction; import com.foreverwin.iep.prd.entity.ZLotMaterialConsumptionTransaction; import com.foreverwin.iep.prd.mapper.ZLotMaterialCompleteTransactionMapper; import com.foreverwin.iep.prd.mapper.ZLotMaterialConsumptionTransactionMapper; -import com.foreverwin.iep.prd.mapper.ZShoporderStatisticsTransactionMapper; import com.foreverwin.iep.wip.entity.LotMaterial; import com.foreverwin.iep.wip.mapper.LotMaterialMapper; import com.foreverwin.mom.common.core.exception.BusinessException; @@ -199,7 +193,6 @@ public class LotMaterialDealSendSapServiceImpl implements LotMaterialDealSendSap @Override public InvokeResponse callLotMaterialConsumption(List zLotMaterialConsumptionTransactions, boolean isPass, String postingDate) { InvokeResponse invokeResponse = new InvokeResponse(); - List newList = new ArrayList<>(); String site = ""; JSONArray itemList = new JSONArray(); List srcList = new ArrayList<>(); @@ -246,7 +239,6 @@ public class LotMaterialDealSendSapServiceImpl implements LotMaterialDealSendSap jsonObject.put("RSNUM", consumptionTransaction.getReservedNo()); // 预留/相关需求的编号 jsonObject.put("RSPOS", consumptionTransaction.getReservedLine()); // 预留 / 相关需求的项目编号 itemList.add(jsonObject); - newList.add(targetObj); } } if (itemList.size() > 0) {