diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index c0323b306..fd09f3b37 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; +import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils; import org.nl.common.utils.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; @@ -158,8 +159,12 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl momRollFoilStart(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilStart(jo), HttpStatus.OK); } @PostMapping("momRollFoilWeighing") - @Log("MES获取AGV称重信息") +// @Log("MES获取AGV称重信息") @SaIgnore + @ApiLog( + bizCode = "/mes/momRollFoilWeighing", + bizDesc = "MES获取AGV称重信息", + systemFlag = "mes" + ) public ResponseEntity momRollFoilWeighing(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilWeighing(jo), HttpStatus.OK); } @PostMapping("/momRollFoilComplete") - @Log("MES执行下卷动作告诉LMS") +// @Log("MES执行下卷动作告诉LMS") @SaIgnore + @ApiLog( + bizCode = "/mes/momRollFoilComplete", + bizDesc = "MES执行下卷动作告诉LMS", + systemFlag = "mes" + ) public ResponseEntity momRollFoilComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilComplete(jo), HttpStatus.OK); } @PostMapping("/momRollBakeNextSpecTransfer") - @Log("MES下达烘箱温度和时间配方给智能物流(MES 包装防护工序Move Out)") +// @Log("MES下达烘箱温度和时间配方给智能物流(MES 包装防护工序Move Out)") @SaIgnore + @ApiLog( + bizCode = "/mes/momRollBakeNextSpecTransfer", + bizDesc = "MES下达烘箱温度和时间配方给智能物流(MES 包装防护工序Move Out)", + systemFlag = "mes" + ) public ResponseEntity momRollBakeNextSpecTransfer(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollBakeNextSpecTransfer(jo), HttpStatus.OK); } @PostMapping("/cutPlanTransfer") - @Log("分切包装段:分切计划(单表,包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管)MES下发智能物流") +// @Log("分切包装段:分切计划(单表,包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管)MES下发智能物流") @SaIgnore + @ApiLog( + bizCode = "/mes/cutPlanTransfer", + bizDesc = "分切包装段:分切计划(单表,包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管)MES下发智能物流", + systemFlag = "mes" + ) public ResponseEntity cutPlanTransfer(@RequestBody JSONArray ja) { return new ResponseEntity<>(mesToLmsService.cutPlanTransfer(ja), HttpStatus.OK); } @PostMapping("/callNextAssAndMomRoll") - @Log("分切即将完成,呼叫配送下一个母卷/改制子卷,MES传智能物流") +// @Log("分切即将完成,呼叫配送下一个母卷/改制子卷,MES传智能物流") @SaIgnore + @ApiLog( + bizCode = "/mes/callNextAssAndMomRoll", + bizDesc = "分切即将完成,呼叫配送下一个母卷/改制子卷,MES传智能物流", + systemFlag = "mes" + ) public ResponseEntity callNextAssAndMomRoll(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.callNextAssAndMomRoll(jo), HttpStatus.OK); } @PostMapping("/childRollCutStartComp") - @Log("当母卷开始分切时,MES系统会将对应的子卷进站信息发送给只能物流系统,一方面物流系统可以预估下个母卷的送达时间,也可以闭环期分切计划指令") +// @Log("当母卷开始分切时,MES系统会将对应的子卷进站信息发送给只能物流系统,一方面物流系统可以预估下个母卷的送达时间,也可以闭环期分切计划指令") @SaIgnore + @ApiLog( + bizCode = "/mes/childRollCutStartComp", + bizDesc = "当母卷开始分切时,MES系统会将对应的子卷进站信息发送给只能物流系统,一方面物流系统可以预估下个母卷的送达时间,也可以闭环期分切计划指令", + systemFlag = "mes" + ) public ResponseEntity childRollCutStartComp(@RequestBody JSONArray ja) { return new ResponseEntity<>(mesToLmsService.childRollCutStartComp(ja), HttpStatus.OK); } @PostMapping("/childRollPackComplete") - @Log("包装完成,传智能物流包装箱与子卷关系及子卷属性值,LMS执行入库") +// @Log("包装完成,传智能物流包装箱与子卷关系及子卷属性值,LMS执行入库") @SaIgnore + @ApiLog( + bizCode = "/mes/childRollPackComplete", + bizDesc = "包装完成,传智能物流包装箱与子卷关系及子卷属性值,LMS执行入库", + systemFlag = "mes" + ) public ResponseEntity childRollPackComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.childRollPackComplete(jo), HttpStatus.OK); } @PostMapping("/inventoryTransferInfoSync") - @Log("转单指令在MES平台查看后,更新信息,发送LMS(是否拆包、更新后的入库日期、是否更换外包装箱标签),LMS重打子卷标签、包装箱外标签") +// @Log("转单指令在MES平台查看后,更新信息,发送LMS(是否拆包、更新后的入库日期、是否更换外包装箱标签),LMS重打子卷标签、包装箱外标签") @SaIgnore + @ApiLog( + bizCode = "/mes/inventoryTransferInfoSync", + bizDesc = "转单指令在MES平台查看后,更新信息,发送LMS(是否拆包、更新后的入库日期、是否更换外包装箱标签),LMS重打子卷标签、包装箱外标签", + systemFlag = "mes" + ) public ResponseEntity inventoryTransferInfoSync(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.inventoryTransferInfoSync(jo), HttpStatus.OK); } @PostMapping("/childRollInfoUpdate") - @Log("子卷信息更新:计划外需求有可能入库完成后,ERP才回传计划外需求SalesOrder") +// @Log("子卷信息更新:计划外需求有可能入库完成后,ERP才回传计划外需求SalesOrder") @SaIgnore + @ApiLog( + bizCode = "/mes/childRollInfoUpdate", + bizDesc = "子卷信息更新:计划外需求有可能入库完成后,ERP才回传计划外需求SalesOrder", + systemFlag = "mes" + ) public ResponseEntity childRollInfoUpdate(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.childRollInfoUpdate(jo), HttpStatus.OK); } @PostMapping("/cutPlanTransferCancel") - @Log("分切计划取消") +// @Log("分切计划取消") @SaIgnore + @ApiLog( + bizCode = "/mes/cutPlanTransferCancel", + bizDesc = "分切计划取消", + systemFlag = "mes" + ) public ResponseEntity cutPlanTransferCancel(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.cutPlanTransferCancel(jo), HttpStatus.OK); } @PostMapping("/sendAuditResult") - @Log("子卷审批结果") +// @Log("子卷报废审批结果回传") @SaIgnore + @ApiLog( + bizCode = "/mes/sendAuditResult", + bizDesc = "子卷报废审批结果回传", + systemFlag = "mes" + ) public ResponseEntity sendAuditResult(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendAuditResult(jo), HttpStatus.OK); } @PostMapping("/sendProcessInfo") - @Log("表处母卷上料、下料接口") +// @Log("表处母卷上料、下料接口") @SaIgnore + @ApiLog( + bizCode = "/mes/sendProcessInfo", + bizDesc = "表处母卷上料、下料接口", + systemFlag = "mes" + ) public ResponseEntity sendProcessInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendProcessInfo(jo), HttpStatus.OK); } @PostMapping("/momRollTRStartMock") - @Log("表处工单推送") +// @Log("表处工单推送") @SaIgnore + @ApiLog( + bizCode = "/mes/momRollTRStartMock", + bizDesc = "表处工单推送", + systemFlag = "mes" + ) public ResponseEntity processFoilStart(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.processFoilStart(jo), HttpStatus.OK); } @PostMapping("/sendTargetHouse") - @Log("MES传递给LMS入线边库或者入成品库") +// @Log("MES传递给LMS入线边库或者入成品库") @SaIgnore + @ApiLog( + bizCode = "/mes/sendTargetHouse", + bizDesc = "MES传递给LMS入线边库或者入成品库", + systemFlag = "mes" + ) public ResponseEntity sendTargetHouse(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendTargetHouse(jo), HttpStatus.OK); } @PostMapping("/momSendSplitMfgOrderBOM") - @Log("MES传递LMS订单BOM") +// @Log("MES传递LMS订单BOM") @SaIgnore + @ApiLog( + bizCode = "/mes/momSendSplitMfgOrderBOM", + bizDesc = "MES传递LMS订单BOM", + systemFlag = "mes" + ) public ResponseEntity momSendSplitMfgOrderBOM(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momSendSplitMfgOrderBOM(jo), HttpStatus.OK); } @PostMapping("/getRollInfo") - @Log("MES传递LMS获取子卷重量信息") +// @Log("MES传递LMS获取子卷重量信息") @SaIgnore + @ApiLog( + bizCode = "/mes/getRollInfo", + bizDesc = "MES传递LMS获取子卷重量信息", + systemFlag = "mes" + ) public ResponseEntity getRollInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.getRollInfo(jo), HttpStatus.OK); } @PostMapping("/sendLevelInfo") - @Log("MES传递LMS定级数据") +// @Log("MES传递LMS定级数据") @SaIgnore + @ApiLog( + bizCode = "/mes/sendLevelInfo", + bizDesc = "MES传递LMS定级数据", + systemFlag = "mes" + ) public ResponseEntity sendLevelInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendLevelInfo(jo), HttpStatus.OK); } @PostMapping("/containerNeedDown") - @Log("子卷拼接完成是否下轴") +// @Log("子卷拼接完成是否下轴") @SaIgnore + @ApiLog( + bizCode = "/mes/containerNeedDown", + bizDesc = "子卷拼接完成是否下轴", + systemFlag = "mes" + ) public ResponseEntity containerNeedDown(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.containerNeedDown(jo), HttpStatus.OK); } @PostMapping("/sendSubInfo") - @Log("子卷下料信息MES传递给LMS") +// @Log("子卷下料信息MES传递给LMS") @SaIgnore + @ApiLog( + bizCode = "/mes/sendSubInfo", + bizDesc = "子卷下料信息MES传递给LMS", + systemFlag = "mes" + ) public ResponseEntity sendSubInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendSubInfo(jo), HttpStatus.OK); } @PostMapping("/changeSect") - @Log("MES传递给LMS入线边库或者入成品库、撤销入线边库、人工改变入线边还是包装") +// @Log("MES传递给LMS入线边库或者入成品库、撤销入线边库、人工改变入线边还是包装") @SaIgnore + @ApiLog( + bizCode = "/mes/changeSect", + bizDesc = "MES传递给LMS入线边库或者入成品库、撤销入线边库、人工改变入线边还是包装", + systemFlag = "mes" + ) public ResponseEntity changeSect(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendTargetHouse(jo), HttpStatus.OK); } @PostMapping("/getWasteFoilWeight") - @Log("分切子卷获取LMS,AGV废箔称重重量") +// @Log("分切子卷获取LMS,AGV废箔称重重量") @SaIgnore + @ApiLog( + bizCode = "/mes/getWasteFoilWeight", + bizDesc = "分切子卷获取LMS,AGV废箔称重重量", + systemFlag = "mes" + ) public ResponseEntity getWasteFoilWeight(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.getWasteFoilWeight(jo), HttpStatus.OK); } @PostMapping("/WasteFoilSuccess") - @Log("分切子卷获取LMS,AGV废箔称重重量") +// @Log("分切子卷获取LMS,AGV废箔称重重量") @SaIgnore + @ApiLog( + bizCode = "/mes/WasteFoilSuccess", + bizDesc = "分切子卷获取LMS,AGV废箔称重重量", + systemFlag = "mes" + ) public ResponseEntity WasteFoilSuccess(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.WasteFoilSuccess(jo), HttpStatus.OK); } @PostMapping("/boxIsPass") - @Log("飞书通知LMS木箱是否通过") +// @Log("飞书通知LMS木箱是否通过") @SaIgnore + @ApiLog( + bizCode = "/mes/boxIsPass", + bizDesc = "飞书通知LMS木箱是否通过", + systemFlag = "mes" + ) public ResponseEntity boxIsPass(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.boxIsPass(jo), HttpStatus.OK); } @PostMapping("/changeBomInfo") - @Log("MES更新LMS分切工单、订单BOM信息") +// @Log("MES更新LMS分切工单、订单BOM信息") @SaIgnore + @ApiLog( + bizCode = "/mes/changeBomInfo", + bizDesc = "MES更新LMS分切工单、订单BOM信息", + systemFlag = "mes" + ) public ResponseEntity changeBomInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.changeBomInfo(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 6302a68f0..23651f558 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.ext.mes.service.impl; import cn.hutool.core.date.DateUtil; import org.checkerframework.checker.units.qual.A; +import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils; import org.nl.common.utils.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -645,11 +646,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { qzz_generation = "4"; } - - // 解析描述数组 - String[] tubeArray = param.getString("PaperTubeDescription").split("\\|"); - // 定义尺寸与长度 - qzz_size = Character.toString(tubeArray[2].charAt(0)); + //定义尺寸与长度 + // todo 88549333 修改 采用公共处理方法获取纸管的规格 2026年05月19日 18:05 + qzz_size = MdmDescriptionParseUtils.extractPaperTubeSize(param.getString("PaperTubeDescription")); } else { if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) { throw new BadRequestException("FRP管物料编码不能为空"); @@ -667,11 +666,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { qzz_generation = "4"; } - - // 解析描述数组 - String[] tubeArray = param.getString("FRPDescription").split("\\|"); // 定义尺寸与长度 - qzz_size = Character.toString(tubeArray[2].charAt(0)); + // todo 88549333 修改 采用公共处理方法获取FRP管的规格 2026年05月19日 18:25 + qzz_size = MdmDescriptionParseUtils.extractFRPTubeSizeTrans(param.getString("FRPDescription")); } JSONObject json = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java index 86d96282b..94bce7a7f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.ApiLog; import org.nl.modules.logging.annotation.Log; import org.nl.wms.ext.sap.service.SapToLmsService; import org.springframework.http.HttpStatus; @@ -23,48 +24,66 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getMaterialInfo") - @Log("SAP给LMS推送物料信息") - + @ApiLog( + bizCode = "/sap/getMaterialInfo", + bizDesc = "SAP给LMS推送物料信息", + systemFlag = "sap" + ) public ResponseEntity getMaterialInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getMaterialInfo(jo), HttpStatus.OK); } @SaIgnore @PostMapping("/getDeliveryInfo") - @Log("SAP给LMS推送交货单信息") - + @ApiLog( + bizCode = "/sap/getDeliveryInfo", + bizDesc = "SAP给LMS推送交货单信息", + systemFlag = "sap" + ) public ResponseEntity getDeliveryInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getDeliveryInfo(jo), HttpStatus.OK); } @SaIgnore @PostMapping("/getReturnDeliveryInfo") - @Log("SAP给LMS推送退货交货单信息") - + @ApiLog( + bizCode = "/sap/getReturnDeliveryInfo", + bizDesc = "SAP给LMS推送退货交货单信息", + systemFlag = "sap" + ) public ResponseEntity getReturnDeliveryInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getReturnDeliveryInfo(jo), HttpStatus.OK); } @SaIgnore @PostMapping("/getCannibalize") - @Log("SAP给LMS推送调拨出库单") - + @ApiLog( + bizCode = "/sap/getCannibalize", + bizDesc = "SAP给LMS推送调拨出库单", + systemFlag = "sap" + ) public ResponseEntity getCannibalize(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getCannibalize(jo), HttpStatus.OK); } @SaIgnore @PostMapping("/getReCutInfo") - @Log("SAP给LMS推送改切出库单") - + @ApiLog( + bizCode = "/sap/getReCutInfo", + bizDesc = "SAP给LMS推送改切出库单", + systemFlag = "sap" + ) public ResponseEntity getReCutInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getReCutInfo(jo), HttpStatus.OK); } @SaIgnore @PostMapping("/getUnPlanInfo") - @Log("SAP给LMS推送计划外子卷转单信息") - + @ApiLog( + bizCode = "/sap/getUnPlanInfo", + bizDesc = "SAP给LMS推送计划外子卷转单信息", + systemFlag = "sap" + ) public ResponseEntity getUnPlanInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getUnPlanInfo(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java index 46f6f1940..78c6e1c70 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.pda.mps.service.impl; import cn.hutool.core.date.DateUtil; +import org.nl.b_lms.sch.tasks.slitter.util.MdmDescriptionParseUtils; import org.nl.common.utils.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -337,9 +338,11 @@ public class PaperTubeServiceImpl implements PaperTubeService { // 区分位置创建 if (ObjectUtil.isNotEmpty(upLeftSizeK) && j == 0) { // 上左 - plan.setPaper_tube_or_FRP(upLeftSizeV.startsWith("48") ? "1" : "2"); - String[] split = upLeftSizeK.split("\\|"); - plan.setQzz_size(String.valueOf(split[2].charAt(0))); + //设置是纸管还是frp管 + //plan.setPaper_tube_or_FRP(upLeftSizeV.startsWith("48") ? "1" : "2"); + //String[] split = upLeftSizeK.split("\\|"); + // todo 88549333 判断是那种类型纸管还是FRP管 ,然后取到 3 或者6 2026年5月20日15:37:09 + plan.setQzz_size(MdmDescriptionParseUtils.extractCommonTubeSize(upLeftSizeK)); if ("1".equals(plan.getPaper_tube_or_FRP())) { plan.setPaper_tube_material(upLeftSizeV); plan.setPaper_tube_model(upLeftSizeK); @@ -354,9 +357,11 @@ public class PaperTubeServiceImpl implements PaperTubeService { } if ( ObjectUtil.isNotEmpty(upRightSizeK) && j == 1) { // 上右 - plan.setPaper_tube_or_FRP(upRightSizeV.startsWith("48") ? "1" : "2"); - String[] split = upRightSizeK.split("\\|"); - plan.setQzz_size(String.valueOf(split[2].charAt(0))); +// plan.setPaper_tube_or_FRP(upRightSizeV.startsWith("48") ? "1" : "2"); +// String[] split = upRightSizeK.split("\\|"); +// plan.setQzz_size(String.valueOf(split[2].charAt(0))); + // todo 88549333 判断是那种类型纸管还是FRP管 ,然后取到 3 或者6 2026年5月20日15:37:09 + plan.setQzz_size(MdmDescriptionParseUtils.extractCommonTubeSize(upRightSizeK)); if ("1".equals(plan.getPaper_tube_or_FRP())) { plan.setPaper_tube_material(upRightSizeV); plan.setPaper_tube_model(upRightSizeK);