From 7a26b3ef2a5f82331ead38e8492d05415dc5f3ee Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 2 Apr 2024 11:18:21 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/mes/controller/MesController.java | 139 ++++++++++++++++++ .../wms/mes/domain/{Public.java => Head.java} | 2 +- .../nl/wms/mes/domain/QPMES060Request.java | 42 +----- .../wms/mes/domain/QPMES060RequestBody.java | 24 +++ .../nl/wms/mes/domain/QPMES060Response.java | 21 +-- .../wms/mes/domain/QPMES060ResponseBody.java | 21 +++ .../nl/wms/mes/domain/QPMES062Request.java | 21 +-- .../wms/mes/domain/QPMES062RequestBody.java | 27 ++++ .../nl/wms/mes/domain/QPMES062Response.java | 46 +----- .../wms/mes/domain/QPMES062ResponseBody.java | 48 ++++++ .../nl/wms/mes/domain/QPMES065Request.java | 34 +---- .../wms/mes/domain/QPMES065RequestBody.java | 40 +++++ .../nl/wms/mes/domain/QPMES065Response.java | 46 +----- .../wms/mes/domain/QPMES065ResponseBody.java | 48 ++++++ .../nl/wms/mes/domain/QPMES098Request.java | 126 +--------------- .../wms/mes/domain/QPMES098RequestBody.java | 47 ++++++ .../mes/domain/QPMES098RequestBodyItem1.java | 29 ++++ .../mes/domain/QPMES098RequestBodyItem2.java | 22 +++ .../wms/mes/domain/QPMES098RequestItem1.java | 92 ------------ .../wms/mes/domain/QPMES098RequestItem2.java | 71 --------- .../nl/wms/mes/domain/QPMES098Response.java | 46 +----- .../wms/mes/domain/QPMES098ResponseBody.java | 47 ++++++ .../nl/wms/mes/domain/QPMES118Response.java | 3 +- .../wms/mes/webservice/WebServiceClient.java | 20 --- .../wms/mes/webservice/WebServiceConfig.java | 86 ----------- .../webservice/service/QPMES060Service.java | 19 --- .../webservice/service/QPMES098Service.java | 18 --- .../webservice/service/QPMES118Service.java | 18 --- .../service/impl/QPMES060ServiceImpl.java | 46 ------ .../service/impl/QPMES098ServiceImpl.java | 60 -------- .../service/impl/QPMES118ServiceImpl.java | 40 ----- .../sch/material/service/dao/Material.java | 3 +- .../sch/task_manage/task/tasks/YCLCKTask.java | 34 +++-- .../sch/task_manage/task/tasks/YCLRKTask.java | 41 +++--- 34 files changed, 579 insertions(+), 848 deletions(-) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/{Public.java => Head.java} (94%) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060ResponseBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062RequestBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062ResponseBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065RequestBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065ResponseBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBody.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem1.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem2.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem1.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem2.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098ResponseBody.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceClient.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceConfig.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES060Service.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES098Service.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES118Service.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES098ServiceImpl.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java index 60fda95..291de74 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java @@ -1,12 +1,35 @@ package org.nl.wms.mes.controller; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.mes.domain.*; +import org.nl.wms.pdm.service.IPdmBdWorkorderService; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.sch.material.service.dao.Material; +import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; +import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + @Slf4j @RestController @Api(tags = "MES交互接口") @@ -14,4 +37,120 @@ import org.springframework.web.bind.annotation.RestController; @SaIgnore @Lazy public class MesController { + + @Autowired + private PointMapper pointMapper; + + @Autowired + private MaterialMapper materialMapper; + + @Autowired + private IPdmBdWorkorderService pdmBdWorkorderService; + + @PostMapping("/QPMES060") + @Log(value = "QPMES060") + @ApiOperation("QPMES060") + @SaIgnore + public QPMES060Response QPMES060(@RequestBody JSONObject notice) { + log.info("QPMES060服务被调用,输入参数：" + notice.toString()); + QPMES060Response qpmes060Response = new QPMES060Response(); + QPMES060ResponseBody qpmes060ResponseBody = new QPMES060ResponseBody(); + List qpmes060ResponseBodyArrayList=new ArrayList<>(); + Head head=new Head(); + head.setDEST_SYSTEM("WMS"); + head.setINTF_ID("QPMES060"); + head.setSRC_MSGID(IdUtil.simpleUUID()); + head.setSRC_SYSTEM("AGV"); + qpmes060Response.setHEAD(head); + try { + Material material = new Material(); + material.copyFrom(notice.toJavaObject(QPMES060Request.class).getBODY().get(0)); + material.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); + materialMapper.insert(material); + qpmes060ResponseBody.setMESSAGE("原材料入库成功"); + qpmes060ResponseBody.setSTATUS("S"); + qpmes060ResponseBodyArrayList.add(qpmes060ResponseBody); + qpmes060Response.setBODY(qpmes060ResponseBodyArrayList); + log.info("QPMES060服务被调用,返回参数：" + qpmes060Response); + return qpmes060Response; + }catch (Exception e){ + log.error("QPMES060服务异常：{}{}",e,e.getMessage()); + qpmes060ResponseBody.setMESSAGE("原材料入库失败"+e.getMessage()); + qpmes060ResponseBody.setSTATUS("E"); + qpmes060ResponseBodyArrayList.add(qpmes060ResponseBody); + qpmes060Response.setBODY(qpmes060ResponseBodyArrayList); + return qpmes060Response; + } + } + + @PostMapping("/QPMES098") + @Log(value = "QPMES098") + @ApiOperation("QPMES098") + @SaIgnore + public QPMES098Response QPMES098(@RequestBody JSONObject notice) { + log.info("QPMES098服务被调用,输入参数：" + notice.toString()); + QPMES098Request qpmes098Request=notice.toJavaObject(QPMES098Request.class); + QPMES098Response qpmes098Response=new QPMES098Response(); + QPMES098ResponseBody qpmes098ResponseBody = new QPMES098ResponseBody(); + List qpmes098ResponseBodyArrayList=new ArrayList<>(); + PdmBdWorkorder entity = new PdmBdWorkorder(); + if("1".equals(qpmes098Request.getBODY().get(0).getZSTAT())) { + entity.setExt_data(qpmes098Request.toString()); + entity.setWorkorder_code(qpmes098Request.getBODY().get(0).getAUFNR()); + entity.setPlan_qty(new BigDecimal((qpmes098Request.getBODY().get(0).getGAMNG()))); + entity.setMaterial_id(qpmes098Request.getBODY().get(0).getPLNBEZ()); + entity.setWorkorder_status(qpmes098Request.getBODY().get(0).getZSTAT()); + entity.setMaterial_code(qpmes098Request.getBODY().get(0).getPLNBEZ()); + entity.setMaterial_name(qpmes098Request.getBODY().get(0).getMAKTX()); + //客户名称 + entity.setExt_id(qpmes098Request.getBODY().get(0).getZKUNNR()); + entity.setCreate_id("0"); + entity.setCreate_name("MES"); + entity.setCreate_time(DateUtil.now()); + pdmBdWorkorderService.create(entity); + qpmes098ResponseBody.setMESSAGE("工单下发成功"); + qpmes098ResponseBody.setSTATUS("S"); + qpmes098ResponseBody.setFKEY_VALUE01(qpmes098Request.getBODY().get(0).getAUFNR()); + }else{ + entity=pdmBdWorkorderService.getOne(new LambdaQueryWrapper() + .eq(PdmBdWorkorder::getWorkorder_code, qpmes098Request.getBODY().get(0).getAUFNR())); + if (ObjectUtil.isEmpty(entity)){ + qpmes098ResponseBody.setSTATUS("E"); + qpmes098ResponseBody.setMESSAGE("生产订单号不存在,无法关闭或删除"); + qpmes098ResponseBody.setFKEY_VALUE01(qpmes098Request.getBODY().get(0).getAUFNR()); + log.info("QPMES090服务被调用,返回参数：" + qpmes098Response); + return qpmes098Response; + } + entity.setWorkorder_status(qpmes098Request.getBODY().get(0).getZSTAT()); + pdmBdWorkorderService.update(entity); + } + Head head=new Head(); + head.setDEST_SYSTEM("WMS"); + head.setINTF_ID("QPMES098"); + head.setSRC_MSGID(IdUtil.simpleUUID()); + head.setSRC_SYSTEM("AGV"); + qpmes098Response.setHEAD(head); + qpmes098ResponseBodyArrayList.add(qpmes098ResponseBody); + qpmes098Response.setBODY(qpmes098ResponseBodyArrayList); + log.info("QPMES098服务被调用,返回参数：" + qpmes098Response); + return qpmes098Response; + } + + @PostMapping("/QPMES118") + @Log(value = "QPMES118") + @ApiOperation("QPMES118") + @SaIgnore + public QPMES118Response QPMES118() { + QPMES118Response qpmes118Response =new QPMES118Response(); + List body=pointMapper.queryByMes(); + qpmes118Response.setBODY(body); + Head head=new Head(); + head.setDEST_SYSTEM("WMS"); + head.setINTF_ID("QPMES060"); + head.setSRC_MSGID(IdUtil.simpleUUID()); + head.setSRC_SYSTEM("AGV"); + qpmes118Response.setHEAD(head); + log.info("QPMES118服务被调用{}",qpmes118Response.toString()); + return qpmes118Response; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Public.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java similarity index 94% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Public.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java index 715a997..9a8d8dd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Public.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java @@ -3,7 +3,7 @@ package org.nl.wms.mes.domain; import lombok.Data; @Data -public class Public { +public class Head { // 接口名称 private String INTF_ID; // 源系统 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Request.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Request.java index 765ca7a..b3158fe 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Request.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Request.java @@ -8,7 +8,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import javax.xml.bind.annotation.XmlRootElement; - +import java.util.List; @Data @ToString @Builder @@ -16,40 +16,8 @@ import javax.xml.bind.annotation.XmlRootElement; @AllArgsConstructor @XmlRootElement @Accessors(chain = true) -public class QPMES060Request extends Public { - // 入库单号 - private String SimtOrderNo; - // 场地 - private String locationCode; - // 入库类型 - private String simtType; - // 到货单号 - private String deliveryNo; - // 扫描库位 - private String whlCode; - // 托盘号 - private String PalletSN; - // 物料条码号 - private String lotSN; - // 物料编码 - private String productName; - // 物料名称 - private String productDescription; - // 供应商编码 - private String supplierCode; - // 供应商名称 - private String supplierName; - // 规格 - private String specification; - // 批次号 - private String batch; - // 数量 - private String qty; - // 来料长度 - private String incomingLength; - // 来料重量 - private String incomingWeight; - // 来料缺陷长度 - private String incomingchipping; - +public class QPMES060Request { + private Head HEAD; + private List BODY; } + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java new file mode 100644 index 0000000..d56e928 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060RequestBody.java @@ -0,0 +1,24 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES060RequestBody { + private String SimtOrderNo; + private String locationCode; + private String simtType; + private String deliveryNo; + private String whlCode; + private String PalletSN; + private String lotSN; + private String productName; + private String productDescription; + private String supplierCode; + private String supplierName; + private String specification; + private String batch; + private double qty; + private double incomingLength; + private double incomingWeight; + private double incomingchipping; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Response.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Response.java index 404a6cd..072c0c3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Response.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Response.java @@ -3,22 +3,11 @@ package org.nl.wms.mes.domain; import lombok.Data; import lombok.ToString; +import java.util.List; + @Data @ToString -public class QPMES060Response extends Public { - // 消息状态 - private String STATUS; - // 消息文本 - private String MESSAGE; - // 预留主键1 - private String KEY_VALUE01; - // 预留主键2 - private String KEY_VALUE02; - // 预留主键3 - private String KEY_VALUE03; - // 预留主键4 - private String KEY_VALUE04; - // 预留主键5 - private String KEY_VALUE05; - +public class QPMES060Response{ + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060ResponseBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060ResponseBody.java new file mode 100644 index 0000000..b2eb684 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060ResponseBody.java @@ -0,0 +1,21 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES060ResponseBody { + // 消息状态 + private String STATUS; + // 消息文本 + private String MESSAGE; + // 预留主键1 + private String KEY_VALUE01; + // 预留主键2 + private String KEY_VALUE02; + // 预留主键3 + private String KEY_VALUE03; + // 预留主键4 + private String KEY_VALUE04; + // 预留主键5 + private String KEY_VALUE05; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Request.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Request.java index 3fa1d06..439f482 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Request.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Request.java @@ -8,6 +8,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; @Data @ToString @@ -16,22 +17,8 @@ import javax.xml.bind.annotation.XmlRootElement; @AllArgsConstructor @XmlRootElement @Accessors(chain = true) -public class QPMES062Request extends Public { - //入库单号 - private String SimtOrderNo; - //场地 - private String locationCode; - //入库类型 - private String simtType; - //到货单号 - private String deliveryNo; - //扫描库位 - private String whlCode; - //物料条码号（托号） - private String PalletSn; - //用户编码 - private String userCode; - //用户名称 - private String userName; +public class QPMES062Request{ + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062RequestBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062RequestBody.java new file mode 100644 index 0000000..a6f1df0 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062RequestBody.java @@ -0,0 +1,27 @@ +package org.nl.wms.mes.domain; + +import lombok.*; +import lombok.experimental.Accessors; + +import javax.xml.bind.annotation.XmlRootElement; + +@Data +public class QPMES062RequestBody extends Head { + //入库单号 + private String SimtOrderNo; + //场地 + private String locationCode; + //入库类型 + private String simtType; + //到货单号 + private String deliveryNo; + //扫描库位 + private String whlCode; + //物料条码号（托号） + private String PalletSn; + //用户编码 + private String userCode; + //用户名称 + private String userName; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Response.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Response.java index dd07c31..3810006 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Response.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062Response.java @@ -2,47 +2,11 @@ package org.nl.wms.mes.domain; import lombok.Data; +import java.util.List; + @Data -public class QPMES062Response extends Public { - //消息状态 - private String STATUS; - //消息文本 - private String MESSAGE; - //预留主键1 - private String KEY_VALUE01; - //预留主键2 - private String KEY_VALUE02; - //预留主键3 - private String KEY_VALUE03; - //预留主键4 - private String KEY_VALUE04; - //预留主键5 - private String KEY_VALUE05; - //预留主键6 - private String KEY_VALUE06; - //预留主键7 - private String KEY_VALUE07; - //预留主键8 - private String KEY_VALUE08; - //预留主键9 - private String KEY_VALUE09; - //预留反馈主键1 - private String FKEY_VALUE01; - //预留反馈主键2 - private String FKEY_VALUE02; - //预留反馈主键3 - private String FKEY_VALUE03; - //预留反馈主键4 - private String FKEY_VALUE04; - //预留反馈主键5 - private String FKEY_VALUE05; - //预留反馈主键6 - private String FKEY_VALUE06; - //预留反馈主键7 - private String FKEY_VALUE07; - //预留反馈主键8 - private String FKEY_VALUE08; - //预留反馈主键9 - private String FKEY_VALUE09; +public class QPMES062Response{ + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062ResponseBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062ResponseBody.java new file mode 100644 index 0000000..9e7bba4 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES062ResponseBody.java @@ -0,0 +1,48 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES062ResponseBody { + //消息状态 + private String STATUS; + //消息文本 + private String MESSAGE; + //预留主键1 + private String KEY_VALUE01; + //预留主键2 + private String KEY_VALUE02; + //预留主键3 + private String KEY_VALUE03; + //预留主键4 + private String KEY_VALUE04; + //预留主键5 + private String KEY_VALUE05; + //预留主键6 + private String KEY_VALUE06; + //预留主键7 + private String KEY_VALUE07; + //预留主键8 + private String KEY_VALUE08; + //预留主键9 + private String KEY_VALUE09; + //预留反馈主键1 + private String FKEY_VALUE01; + //预留反馈主键2 + private String FKEY_VALUE02; + //预留反馈主键3 + private String FKEY_VALUE03; + //预留反馈主键4 + private String FKEY_VALUE04; + //预留反馈主键5 + private String FKEY_VALUE05; + //预留反馈主键6 + private String FKEY_VALUE06; + //预留反馈主键7 + private String FKEY_VALUE07; + //预留反馈主键8 + private String FKEY_VALUE08; + //预留反馈主键9 + private String FKEY_VALUE09; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Request.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Request.java index 22632a1..abe8ddd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Request.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Request.java @@ -8,6 +8,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; @Data @ToString @@ -16,34 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement; @AllArgsConstructor @XmlRootElement @Accessors(chain = true) -public class QPMES065Request extends Public { - //工单号 - private String moname; - //物料条码（托号） - private String lotSN; - //领料数量 - private String qty; - //场地 - private String siteName; - //预留字段1 - private String ZXXV01; - //预留字段2 - private String ZXXV02; - //预留字段3 - private String ZXXV03; - //预留字段4 - private String ZXXV04; - //预留字段5 - private String ZXXV05; - //预留字段6 - private String ZXXV06; - //预留字段7 - private String ZXXV07; - //预留字段8 - private String ZXXV08; - //预留字段9 - private String ZXXV09; - //预留字段10 - private String ZXXV10; - +public class QPMES065Request { + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065RequestBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065RequestBody.java new file mode 100644 index 0000000..8445d68 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065RequestBody.java @@ -0,0 +1,40 @@ +package org.nl.wms.mes.domain; + +import lombok.*; +import lombok.experimental.Accessors; + +import javax.xml.bind.annotation.XmlRootElement; + +@Data +public class QPMES065RequestBody { + + //工单号 + private String moname; + //物料条码（托号） + private String lotSN; + //领料数量 + private String qty; + //场地 + private String siteName; + //预留字段1 + private String ZXXV01; + //预留字段2 + private String ZXXV02; + //预留字段3 + private String ZXXV03; + //预留字段4 + private String ZXXV04; + //预留字段5 + private String ZXXV05; + //预留字段6 + private String ZXXV06; + //预留字段7 + private String ZXXV07; + //预留字段8 + private String ZXXV08; + //预留字段9 + private String ZXXV09; + //预留字段10 + private String ZXXV10; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Response.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Response.java index 7cf909e..e17a62e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Response.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065Response.java @@ -2,47 +2,11 @@ package org.nl.wms.mes.domain; import lombok.Data; +import java.util.List; + @Data -public class QPMES065Response extends Public { - //消息状态 - private String STATUS; - //消息文本 - private String MESSAGE; - //预留主键1 - private String KEY_VALUE01; - //预留主键2 - private String KEY_VALUE02; - //预留主键3 - private String KEY_VALUE03; - //预留主键4 - private String KEY_VALUE04; - //预留主键5 - private String KEY_VALUE05; - //预留主键6 - private String KEY_VALUE06; - //预留主键7 - private String KEY_VALUE07; - //预留主键8 - private String KEY_VALUE08; - //预留主键9 - private String KEY_VALUE09; - //预留反馈主键1 - private String FKEY_VALUE01; - //预留反馈主键2 - private String FKEY_VALUE02; - //预留反馈主键3 - private String FKEY_VALUE03; - //预留反馈主键4 - private String FKEY_VALUE04; - //预留反馈主键5 - private String FKEY_VALUE05; - //预留反馈主键6 - private String FKEY_VALUE06; - //预留反馈主键7 - private String FKEY_VALUE07; - //预留反馈主键8 - private String FKEY_VALUE08; - //预留反馈主键9 - private String FKEY_VALUE09; +public class QPMES065Response{ + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065ResponseBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065ResponseBody.java new file mode 100644 index 0000000..370089b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES065ResponseBody.java @@ -0,0 +1,48 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES065ResponseBody { + //消息状态 + private String STATUS; + //消息文本 + private String MESSAGE; + //预留主键1 + private String KEY_VALUE01; + //预留主键2 + private String KEY_VALUE02; + //预留主键3 + private String KEY_VALUE03; + //预留主键4 + private String KEY_VALUE04; + //预留主键5 + private String KEY_VALUE05; + //预留主键6 + private String KEY_VALUE06; + //预留主键7 + private String KEY_VALUE07; + //预留主键8 + private String KEY_VALUE08; + //预留主键9 + private String KEY_VALUE09; + //预留反馈主键1 + private String FKEY_VALUE01; + //预留反馈主键2 + private String FKEY_VALUE02; + //预留反馈主键3 + private String FKEY_VALUE03; + //预留反馈主键4 + private String FKEY_VALUE04; + //预留反馈主键5 + private String FKEY_VALUE05; + //预留反馈主键6 + private String FKEY_VALUE06; + //预留反馈主键7 + private String FKEY_VALUE07; + //预留反馈主键8 + private String FKEY_VALUE08; + //预留反馈主键9 + private String FKEY_VALUE09; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Request.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Request.java index 691be97..b54103b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Request.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Request.java @@ -17,125 +17,7 @@ import java.util.List; @AllArgsConstructor @XmlRootElement @Accessors(chain = true) -public class QPMES098Request extends Public { - //生产订单号 - private String AUFNR; - //订单类型 - private String AUART; - //工厂代码 - private String WERKS; - //产品编码 - private String PLNBEZ; - //产品名称 - private String MAKTX; - //产品计划产量 - private String GAMNG; - //预计开工时间 - private String GSTRP; - //预计完工时间 - private String GLTRP; - //订单创建人 - private String ERNAM; - //订单创建日期 - private String ERDAT; - //订单修改人 - private String AENAM; - //订单修改日期 - private String AEDAT; - //预留号 - private String RSNUM; - //BOM版本号 - private String ZBBH; - //车间 - private String ZWORK; - //产品物料类别 - private String MATKL; - //客户 - private String ZKUNNR; - //MES工单类型 - private String ZMESGDLX; - //MES单据类型 - private String ZMESDJLX; - //工艺ID - private String ZGYID; - //工字轮型号 - private String ZGZLXH; - //间距 - private String ZJJ; - //镀覆砂批号/裸砂批号 - private String ZPH; - //是否特定工单 - private String ZTDGD; - //是否客退在库重绕 - private String ZKTZKCR; - //备注 - private String ZBZ; - //规格 - private String ZGG; - //工艺投产量 - private String ZGYTCL; - //线型代码 - private String FXXDM; - //订单状态 - private String ZSTAT; - //是否允许超入 - private String UEBTK; - //预留字段1 - private String ZRSV01; - //预留字段2 - private String ZRSV02; - //预留字段3 - private String ZRSV03; - //预留字段4 - private String ZRSV04; - //预留字段5 - private String ZRSV05; - //ITEM1 - private List item1; - //ITEM2 - private List item2; - - @Override - public String toString() { - return "QPMES098Request{" + - "AUFNR='" + AUFNR + '\'' + - ", AUART='" + AUART + '\'' + - ", WERKS='" + WERKS + '\'' + - ", PLNBEZ='" + PLNBEZ + '\'' + - ", MAKTX='" + MAKTX + '\'' + - ", GAMNG='" + GAMNG + '\'' + - ", GSTRP='" + GSTRP + '\'' + - ", GLTRP='" + GLTRP + '\'' + - ", ERNAM='" + ERNAM + '\'' + - ", ERDAT='" + ERDAT + '\'' + - ", AENAM='" + AENAM + '\'' + - ", AEDAT='" + AEDAT + '\'' + - ", RSNUM='" + RSNUM + '\'' + - ", ZBBH='" + ZBBH + '\'' + - ", ZWORK='" + ZWORK + '\'' + - ", MATKL='" + MATKL + '\'' + - ", ZKUNNR='" + ZKUNNR + '\'' + - ", ZMESGDLX='" + ZMESGDLX + '\'' + - ", ZMESDJLX='" + ZMESDJLX + '\'' + - ", ZGYID='" + ZGYID + '\'' + - ", ZGZLXH='" + ZGZLXH + '\'' + - ", ZJJ='" + ZJJ + '\'' + - ", ZPH='" + ZPH + '\'' + - ", ZTDGD='" + ZTDGD + '\'' + - ", ZKTZKCR='" + ZKTZKCR + '\'' + - ", ZBZ='" + ZBZ + '\'' + - ", ZGG='" + ZGG + '\'' + - ", ZGYTCL='" + ZGYTCL + '\'' + - ", FXXDM='" + FXXDM + '\'' + - ", ZSTAT='" + ZSTAT + '\'' + - ", UEBTK='" + UEBTK + '\'' + - ", ZRSV01='" + ZRSV01 + '\'' + - ", ZRSV02='" + ZRSV02 + '\'' + - ", ZRSV03='" + ZRSV03 + '\'' + - ", ZRSV04='" + ZRSV04 + '\'' + - ", ZRSV05='" + ZRSV05 + '\'' + - ", item1=" + item1.toString() + - ", item2=" + item2.toString() + - '}'; - } -} +public class QPMES098Request{ + private Head HEAD; + private List BODY; +} \ No newline at end of file diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBody.java new file mode 100644 index 0000000..419c396 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBody.java @@ -0,0 +1,47 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +import java.util.List; + +@Data +public class QPMES098RequestBody { + private String AUFNR; + private String AUART; + private String WERKS; + private String PLNBEZ; + private String MAKTX; + private String GAMNG; + private String GSTRP; + private String GLTRP; + private String ERNAM; + private String ERDAT; + private String AENAM; + private String AEDAT; + private String RSNUM; + private String ZBBH; + private String ZWORK; + private String MATKL; + private String ZKUNNR; + private String ZMESGDLX; + private String ZMESDJLX; + private String ZGYID; + private String ZGZLXH; + private String ZJJ; + private String ZPH; + private String ZTDGD; + private String ZKTZKCR; + private String ZBZ; + private String ZGG; + private String ZGYTCL; + private String FXXDM; + private String ZSTAT; + private String UEBTK; + private String ZRSV01; + private String ZRSV02; + private String ZRSV03; + private String ZRSV04; + private String ZRSV05; + private List ITEM1; + private List ITEM2; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem1.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem1.java new file mode 100644 index 0000000..5f38085 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem1.java @@ -0,0 +1,29 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES098RequestBodyItem1 { + private String VORNR; + private String XLOEK; + private String LTXA1; + private String STEUS; + private String BMSCH; + private String VGW01; + private String VGE01; + private String VGW02; + private String VGE02; + private String VGW03; + private String VGE03; + private String VGW04; + private String VGE04; + private String VGW05; + private String VGE05; + private String VGW06; + private String VGE06; + private String ZRSV06; + private String ZRSV07; + private String ZRSV08; + private String ZRSV09; + private String ZRSV10; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem2.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem2.java new file mode 100644 index 0000000..b48ac9b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestBodyItem2.java @@ -0,0 +1,22 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES098RequestBodyItem2 { + private String POSNR; + private String RSPOS; + private String BWART; + private String MATNR; + private String MAKTX; + private String MTYPE; + private String MTYTXT; + private String BDMNG; + private String MEINS; + private String BEIKZ; + private String ZRSV11; + private String ZRSV12; + private String ZRSV13; + private String ZRSV14; + private String ZRSV15; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem1.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem1.java deleted file mode 100644 index db9cf18..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem1.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.nl.wms.mes.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; -import lombok.experimental.Accessors; - -import javax.xml.bind.annotation.XmlRootElement; - -@Data -@ToString -@Builder -@NoArgsConstructor -@AllArgsConstructor -@XmlRootElement -@Accessors(chain = true) -public class QPMES098RequestItem1 { - //工序号 - private String VORNR; - //删除标记 - private String XLOEK; - //工序描述 - private String LTXA1; - //控制码 - private String STEUS; - //基本数量 - private String BMSCH; - //直接人工 - private String VGW01; - //直接人工单位 - private String VGE01; - //间接人工 - private String VGW02; - //间接人工单位 - private String VGE02; - //间接材料 - private String VGW03; - //间接材料单位 - private String VGE03; - //折旧摊销 - private String VGW04; - //折旧摊销单位 - private String VGE04; - //能源动力 - private String VGW05; - //能源动力单位 - private String VGE05; - //其它制造费用 - private String VGW06; - //其它制造费用单位 - private String VGE06; - //预留字段6 - private String ZRSV06; - //预留字段7 - private String ZRSV07; - //预留字段8 - private String ZRSV08; - //预留字段9 - private String ZRSV09; - //预留字段10 - private String ZRSV10; - - @Override - public String toString() { - return "QPMES098RequestItem1{" + - "VORNR='" + VORNR + '\'' + - ", XLOEK='" + XLOEK + '\'' + - ", LTXA1='" + LTXA1 + '\'' + - ", STEUS='" + STEUS + '\'' + - ", BMSCH='" + BMSCH + '\'' + - ", VGW01='" + VGW01 + '\'' + - ", VGE01='" + VGE01 + '\'' + - ", VGW02='" + VGW02 + '\'' + - ", VGE02='" + VGE02 + '\'' + - ", VGW03='" + VGW03 + '\'' + - ", VGE03='" + VGE03 + '\'' + - ", VGW04='" + VGW04 + '\'' + - ", VGE04='" + VGE04 + '\'' + - ", VGW05='" + VGW05 + '\'' + - ", VGE05='" + VGE05 + '\'' + - ", VGW06='" + VGW06 + '\'' + - ", VGE06='" + VGE06 + '\'' + - ", ZRSV06='" + ZRSV06 + '\'' + - ", ZRSV07='" + ZRSV07 + '\'' + - ", ZRSV08='" + ZRSV08 + '\'' + - ", ZRSV09='" + ZRSV09 + '\'' + - ", ZRSV10='" + ZRSV10 + '\'' + - '}'; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem2.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem2.java deleted file mode 100644 index d4b9743..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098RequestItem2.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.wms.mes.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; -import lombok.experimental.Accessors; - -import javax.xml.bind.annotation.XmlRootElement; - -@Data -@ToString -@Builder -@NoArgsConstructor -@AllArgsConstructor -@XmlRootElement -@Accessors(chain = true) -public class QPMES098RequestItem2 { - //订单行项目编号 - private String POSNR; - //预留行项目编号 - private String RSPOS; - //移动类型 - private String BWART; - //物料编码 - private String MATNR; - //物料名称 - private String MAKTX; - //产品类别 - private String MTYPE; - //产品类别描述 - private String MTYTXT; - //数量 - private String BDMNG; - //计量单位 - private String MEINS; - //物料供应标识 - private String BEIKZ; - //预留字段11 - private String ZRSV11; - //预留字段12 - private String ZRSV12; - //预留字段13 - private String ZRSV13; - //预留字段14 - private String ZRSV14; - //预留字段15 - private String ZRSV15; - - @Override - public String toString() { - return "QPMES098RequestItem2{" + - "POSNR='" + POSNR + '\'' + - ", RSPOS='" + RSPOS + '\'' + - ", BWART='" + BWART + '\'' + - ", MATNR='" + MATNR + '\'' + - ", MAKTX='" + MAKTX + '\'' + - ", MTYPE='" + MTYPE + '\'' + - ", MTYTXT='" + MTYTXT + '\'' + - ", BDMNG='" + BDMNG + '\'' + - ", MEINS='" + MEINS + '\'' + - ", BEIKZ='" + BEIKZ + '\'' + - ", ZRSV11='" + ZRSV11 + '\'' + - ", ZRSV12='" + ZRSV12 + '\'' + - ", ZRSV13='" + ZRSV13 + '\'' + - ", ZRSV14='" + ZRSV14 + '\'' + - ", ZRSV15='" + ZRSV15 + '\'' + - '}'; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Response.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Response.java index 60517ce..6588ded 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Response.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Response.java @@ -3,48 +3,12 @@ package org.nl.wms.mes.domain; import lombok.Data; import lombok.ToString; +import java.util.List; + @Data @ToString -public class QPMES098Response extends Public { - //消息状态 - private String STATUS; - //消息文本 - private String MESSAGE; - //预留主键1 - private String KEY_VALUE01; - //预留主键2 - private String KEY_VALUE02; - //预留主键3 - private String KEY_VALUE03; - //预留主键4 - private String KEY_VALUE04; - //预留主键5 - private String KEY_VALUE05; - //预留主键6 - private String KEY_VALUE06; - //预留主键7 - private String KEY_VALUE07; - //预留主键8 - private String KEY_VALUE08; - //预留主键9 - private String KEY_VALUE09; - //预留反馈主键1 - private String FKEY_VALUE01; - //预留反馈主键2 - private String FKEY_VALUE02; - //预留反馈主键3 - private String FKEY_VALUE03; - //预留反馈主键4 - private String FKEY_VALUE04; - //预留反馈主键5 - private String FKEY_VALUE05; - //预留反馈主键6 - private String FKEY_VALUE06; - //预留反馈主键7 - private String FKEY_VALUE07; - //预留反馈主键8 - private String FKEY_VALUE08; - //预留反馈主键9 - private String FKEY_VALUE09; +public class QPMES098Response{ + private Head HEAD; + private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098ResponseBody.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098ResponseBody.java new file mode 100644 index 0000000..c919ecd --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098ResponseBody.java @@ -0,0 +1,47 @@ +package org.nl.wms.mes.domain; + +import lombok.Data; + +@Data +public class QPMES098ResponseBody { + //消息状态 + private String STATUS; + //消息文本 + private String MESSAGE; + //预留主键1 + private String KEY_VALUE01; + //预留主键2 + private String KEY_VALUE02; + //预留主键3 + private String KEY_VALUE03; + //预留主键4 + private String KEY_VALUE04; + //预留主键5 + private String KEY_VALUE05; + //预留主键6 + private String KEY_VALUE06; + //预留主键7 + private String KEY_VALUE07; + //预留主键8 + private String KEY_VALUE08; + //预留主键9 + private String KEY_VALUE09; + //预留反馈主键1 + private String FKEY_VALUE01; + //预留反馈主键2 + private String FKEY_VALUE02; + //预留反馈主键3 + private String FKEY_VALUE03; + //预留反馈主键4 + private String FKEY_VALUE04; + //预留反馈主键5 + private String FKEY_VALUE05; + //预留反馈主键6 + private String FKEY_VALUE06; + //预留反馈主键7 + private String FKEY_VALUE07; + //预留反馈主键8 + private String FKEY_VALUE08; + //预留反馈主键9 + private String FKEY_VALUE09; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java index bfdd870..203f7d0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java @@ -7,7 +7,8 @@ import java.util.List; @Data @ToString -public class QPMES118Response extends Public { +public class QPMES118Response{ + private Head HEAD; private List BODY; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceClient.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceClient.java deleted file mode 100644 index 3cbc084..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceClient.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.mes.webservice; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ws.client.core.WebServiceTemplate; -import org.springframework.ws.soap.client.core.SoapActionCallback; -import org.springframework.stereotype.Service; -@Service -public class WebServiceClient { - - public void callWebService(Object request,String url) { - String soapAction = ""; - WebServiceTemplate webServiceTemplate = new WebServiceTemplate(); - // 发送 SOAP 请求并获取响应 - Object response = webServiceTemplate.marshalSendAndReceive(url, request, new SoapActionCallback(soapAction)); - - // 处理响应 - System.out.println("Response: " + response); - - // 其他处理： 转对象、转字符串等操作 - } -} \ No newline at end of file diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceConfig.java deleted file mode 100644 index 5436757..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/WebServiceConfig.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.nl.wms.mes.webservice; - -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBus; -import org.apache.cxf.jaxws.EndpointImpl; -import org.apache.cxf.transport.servlet.CXFServlet; -import org.nl.wms.mes.webservice.service.QPMES060Service; -import org.nl.wms.mes.webservice.service.QPMES098Service; -import org.nl.wms.mes.webservice.service.QPMES118Service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.xml.ws.Endpoint; - -@Configuration -public class WebServiceConfig { - - @Autowired - private QPMES060Service qpmes060Service; - - @Autowired - private QPMES098Service qpmes098Service; - - @Autowired - private QPMES118Service qpmes118Service; - -// @Autowired -// private WebServiceAuthInterceptor interceptor; - - /** - * Apache CXF 核心架构是以BUS为核心，整合其他组件。 - * Bus是CXF的主干, 为共享资源提供一个可配置的场所，作用类似于Spring的ApplicationContext，这些共享资源包括 - * WSDl管理器、绑定工厂等。通过对BUS进行扩展，可以方便地容纳自己的资源，或者替换现有的资源。默认Bus实现基于Spring架构， - * 通过依赖注入，在运行时将组件串联起来。BusFactory负责Bus的创建。默认的BusFactory是SpringBusFactory，对应于默认 - * 的Bus实现。在构造过程中，SpringBusFactory会搜索META-INF/cxf（包含在 CXF 的jar中）下的所有bean配置文件。 - * 根据这些配置文件构建一个ApplicationContext。开发者也可以提供自己的配置文件来定制Bus。 - */ - @Bean(name = Bus.DEFAULT_BUS_ID) - public SpringBus springBus() { - return new SpringBus(); - } - - /** - * http://localhost:8010/webServices?wsdl - */ - @Bean - public ServletRegistrationBean getRegistrationBean() { - return new ServletRegistrationBean(new CXFServlet(), "/webServices/*"); - } - - /** - * http://localhost:8010/webServices/qpmes060?wsdl - */ - @Bean - public Endpoint messageEndPoint() { - EndpointImpl endpoint = new EndpointImpl(springBus(), qpmes060Service); - endpoint.publish("/qpmes060"); -// endpoint.getInInterceptors().add(this.interceptor); - return endpoint; - } - - /** - * http://localhost:8010/webServices/qpmes098?wsdl - */ - @Bean - public Endpoint messageEndPoint1() { - EndpointImpl endpoint = new EndpointImpl(springBus(), qpmes098Service); - endpoint.publish("/qpmes098"); -// endpoint.getInInterceptors().add(this.interceptor); - return endpoint; - } - - /** - * http://localhost:8010/webServices/qpmes118?wsdl - */ - @Bean - public Endpoint messageEndPoint2() { - EndpointImpl endpoint = new EndpointImpl(springBus(), qpmes118Service); - endpoint.publish("/qpmes118"); -// endpoint.getInInterceptors().add(this.interceptor); - return endpoint; - } - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES060Service.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES060Service.java deleted file mode 100644 index 4c4d763..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES060Service.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.mes.webservice.service; - -import org.nl.wms.mes.domain.QPMES060Request; -import org.nl.wms.mes.domain.QPMES060Response; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import java.util.List; - -@WebService( - name = "QPMES060", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010"// 命名空间,一般是接口的包名倒序 -) -public interface QPMES060Service { - - @WebMethod(operationName = "QPMES060") - public QPMES060Response QPMES060(@WebParam(name = "QPMES060") QPMES060Request notice); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES098Service.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES098Service.java deleted file mode 100644 index 2d82093..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES098Service.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.nl.wms.mes.webservice.service; - -import org.nl.wms.mes.domain.QPMES098Request; -import org.nl.wms.mes.domain.QPMES098Response; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; - -@WebService( - name = "QPMES098", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010"// 命名空间,一般是接口的包名倒序 -) -public interface QPMES098Service { - - @WebMethod(operationName = "QPMES098") - public QPMES098Response QPMES098(@WebParam(name = "QPMES098") QPMES098Request notice); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES118Service.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES118Service.java deleted file mode 100644 index 1ec742d..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES118Service.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.nl.wms.mes.webservice.service; - -import org.nl.wms.mes.domain.QPMES118Response; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import java.util.List; - -@WebService( - name = "QPMES118", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010"// 命名空间,一般是接口的包名倒序 -) -public interface QPMES118Service { - - @WebMethod - public QPMES118Response QPMES118(); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java deleted file mode 100644 index ae29caa..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.nl.wms.mes.webservice.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.util.IdUtil; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.mes.domain.QPMES060Request; -import org.nl.wms.mes.domain.QPMES060Response; -import org.nl.wms.mes.webservice.service.QPMES060Service; -import org.nl.wms.sch.material.service.dao.Material; -import org.nl.wms.sch.material.service.dao.mapper.MaterialMapper; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.jws.WebService; - -@Component -@WebService( - name = "QPMES060", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序 - endpointInterface = "org.nl.wms.mes.webservice.service.QPMES060Service" // 接口类全路径 -) -@Slf4j -public class QPMES060ServiceImpl implements QPMES060Service { - - @Autowired - private MaterialMapper materialMapper; - - @Override - public QPMES060Response QPMES060(QPMES060Request notice){ - - log.info("QPMES060服务被调用,输入参数：" + notice.toString()); - Material material=new Material(); - material.copyFrom(notice); - material.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); - materialMapper.insert(material); - QPMES060Response qpmes060Response=new QPMES060Response(); - qpmes060Response.setDEST_SYSTEM("WMS"); - qpmes060Response.setINTF_ID("QPMES060"); - qpmes060Response.setSRC_MSGID(IdUtil.simpleUUID()); - qpmes060Response.setSRC_SYSTEM("AGV"); - log.info("QPMES060服务被调用,返回参数：" + qpmes060Response.toString()); - return qpmes060Response; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES098ServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES098ServiceImpl.java deleted file mode 100644 index 6298ffd..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES098ServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.nl.wms.mes.webservice.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.mes.domain.QPMES098Request; -import org.nl.wms.mes.domain.QPMES098Response; -import org.nl.wms.mes.webservice.service.QPMES098Service; -import org.nl.wms.pdm.service.IPdmBdWorkorderService; -import org.nl.wms.pdm.service.dao.PdmBdWorkorder; -import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.jws.WebService; -import java.math.BigDecimal; - -@Component -@WebService( - name = "QPMES098", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序 - endpointInterface = "org.nl.wms.mes.webservice.service.QPMES098Service" // 接口类全路径 -) -@Slf4j -public class QPMES098ServiceImpl implements QPMES098Service { - - @Autowired - private IPdmBdWorkorderService pdmBdWorkorderService; - - @Override - public QPMES098Response QPMES098(QPMES098Request notice){ - log.info("服务被调用 参数：" + notice.toString()); - QPMES098Response qpmes098Response=new QPMES098Response(); - PdmBdWorkorder entity = new PdmBdWorkorder(); - if("1".equals(notice.getZSTAT())) { - entity.setExt_data(notice.toString()); - entity.setWorkorder_code(notice.getAUFNR()); - entity.setPlan_qty(new BigDecimal((notice.getGAMNG()))); - entity.setMaterial_id(notice.getPLNBEZ()); - entity.setWorkorder_status(notice.getZSTAT()); - entity.setMaterial_code(notice.getPLNBEZ()); - entity.setMaterial_name(notice.getMAKTX()); - //客户名称 - entity.setExt_id(notice.getZKUNNR()); - pdmBdWorkorderService.create(entity); - }else{ - entity=pdmBdWorkorderService.getOne(new LambdaQueryWrapper() - .eq(PdmBdWorkorder::getWorkorder_code, notice.getAUFNR())); - if (ObjectUtil.isEmpty(entity)){ - qpmes098Response.setSTATUS("E"); - qpmes098Response.setMESSAGE("生产订单号不存在,无法关闭或删除"); - qpmes098Response.setFKEY_VALUE01(notice.getAUFNR()); - return qpmes098Response; - } - entity.setWorkorder_status(notice.getZSTAT()); - pdmBdWorkorderService.update(entity); - } - return qpmes098Response; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java deleted file mode 100644 index 817ac93..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.nl.wms.mes.webservice.service.impl; - -import cn.hutool.core.util.IdUtil; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.mes.domain.QPMES118Response; -import org.nl.wms.mes.domain.QPMES118ResponseBody; -import org.nl.wms.mes.webservice.service.QPMES118Service; -import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.jws.WebService; -import java.util.ArrayList; -import java.util.List; - -@Component -@WebService( - name = "QPMES118", // 暴露服务名称 - targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序 - endpointInterface = "org.nl.wms.mes.webservice.service.QPMES118Service" // 接口类全路径 -) -@Slf4j -public class QPMES118ServiceImpl implements QPMES118Service { - - @Autowired - private PointMapper pointMapper; - - @Override - public QPMES118Response QPMES118(){ - QPMES118Response qpmes118Response =new QPMES118Response(); - List body=pointMapper.queryByMes(); - qpmes118Response.setBODY(body); - qpmes118Response.setDEST_SYSTEM("WMS"); - qpmes118Response.setINTF_ID("QPMES118"); - qpmes118Response.setSRC_MSGID(IdUtil.simpleUUID()); - qpmes118Response.setSRC_SYSTEM("AGV"); - log.info("QPMES118服务被调用"); - return qpmes118Response; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java index 0714c7f..e3127d6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dao/Material.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.nl.wms.mes.domain.QPMES060Request; +import org.nl.wms.mes.domain.QPMES060RequestBody; import java.io.Serializable; import java.math.BigDecimal; @@ -56,7 +57,7 @@ public class Material implements Serializable { @ApiModelProperty(value = "绑定状态") private String group_bind_material_status; - public void copyFrom(QPMES060Request source){ + public void copyFrom(QPMES060RequestBody source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 02de708..4180760 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -3,6 +3,8 @@ package org.nl.wms.sch.task_manage.task.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -10,9 +12,8 @@ import org.nl.common.exception.BadRequestException; import org.nl.config.MapOf; import org.nl.wms.ext.service.WmsToAcsService; import org.nl.wms.ext.service.dto.to.BaseResponse; -import org.nl.wms.mes.domain.QPMES062Request; import org.nl.wms.mes.domain.QPMES065Request; -import org.nl.wms.mes.webservice.WebServiceClient; +import org.nl.wms.mes.domain.QPMES065RequestBody; import org.nl.wms.pdm.service.IPdmBdWorkorderService; import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; @@ -38,6 +39,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -70,8 +72,6 @@ public class YCLCKTask extends AbstractTask { @Autowired private PointMapper pointMapper; @Autowired - private WebServiceClient webServiceClient; - @Autowired private MaterialMapper materialMapper; @@ -231,15 +231,23 @@ public class YCLCKTask extends AbstractTask { .eq(PdmBdWorkorder::getMaterial_code, materialList.get(0).getProductName())); String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES065"; QPMES065Request qpmes065Request = new QPMES065Request(); - qpmes065Request.setDEST_SYSTEM("WMS"); - qpmes065Request.setINTF_ID("QPMES065"); - qpmes065Request.setSRC_MSGID(IdUtil.simpleUUID()); - qpmes065Request.setSRC_SYSTEM("AGV"); - qpmes065Request.setMoname(pdmBdWorkorder.getWorkorder_code()); - qpmes065Request.setLotSN(materialList.get(0).getPalletSN()); - qpmes065Request.setQty(String.valueOf(one.getMaterial_qty())); - qpmes065Request.setSiteName(materialList.get(0).getLocationCode()); - webServiceClient.callWebService(qpmes065Request, url); + List qpmes065RequestBodyList=new ArrayList<>(); + QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody(); + qpmes065Request.getHEAD().setDEST_SYSTEM("WMS"); + qpmes065Request.getHEAD().setINTF_ID("QPMES065"); + qpmes065Request.getHEAD().setSRC_MSGID(IdUtil.simpleUUID()); + qpmes065Request.getHEAD().setSRC_SYSTEM("AGV"); + qpmes065RequestBody.setMoname(pdmBdWorkorder.getWorkorder_code()); + qpmes065RequestBody.setLotSN(materialList.get(0).getPalletSN()); + qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty())); + qpmes065RequestBody.setSiteName(materialList.get(0).getLocationCode()); + qpmes065RequestBodyList.add(qpmes065RequestBody); + qpmes065Request.setBODY(qpmes065RequestBodyList); + log.info("开始调用QPMES065服务，入参{}",qpmes065Request.toString()); + String resultMsg = HttpRequest.post(url) + .body(JSON.toJSONString(qpmes065Request)) + .execute().body(); + log.info("QPMES062服务调用成功，反馈{}",resultMsg); } else { log.error("当前子托盘:" + taskObj.getVehicle_code2() + "不存在未解绑的物料信息，请确认！"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java index 7edc011..92dacd2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java @@ -3,14 +3,15 @@ package org.nl.wms.sch.task_manage.task.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; -import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.dto.to.BaseResponse; import org.nl.wms.mes.domain.QPMES062Request; -import org.nl.wms.mes.webservice.WebServiceClient; +import org.nl.wms.mes.domain.QPMES062RequestBody; import org.nl.wms.pdm.service.IPdmBdWorkorderService; import org.nl.wms.pdm.service.dao.PdmBdWorkorder; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; @@ -70,8 +71,6 @@ public class YCLRKTask extends AbstractTask { @Autowired private PointMapper pointMapper; @Autowired - private WebServiceClient webServiceClient; - @Autowired private MaterialMapper materialMapper; @Override @@ -208,19 +207,27 @@ public class YCLRKTask extends AbstractTask { if(ObjectUtil.isNotEmpty(materialList)) { String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES062 "; QPMES062Request qpmes062Request = new QPMES062Request(); - qpmes062Request.setDEST_SYSTEM("WMS"); - qpmes062Request.setINTF_ID("QPMES062"); - qpmes062Request.setSRC_MSGID(IdUtil.simpleUUID()); - qpmes062Request.setSRC_SYSTEM("AGV"); - qpmes062Request.setSimtOrderNo(materialList.get(0).getSimtOrderNo()); - qpmes062Request.setLocationCode(materialList.get(0).getLocationCode()); - qpmes062Request.setSimtType(materialList.get(0).getSimtType()); - qpmes062Request.setDeliveryNo(materialList.get(0).getDeliveryNo()); - qpmes062Request.setWhlCode(materialList.get(0).getWhlCode()); - qpmes062Request.setPalletSn(materialList.get(0).getPalletSN()); - qpmes062Request.setUserCode(materialList.get(0).getSupplierCode()); - qpmes062Request.setUserName(materialList.get(0).getSupplierName()); - webServiceClient.callWebService(qpmes062Request, url); + qpmes062Request.getHEAD().setDEST_SYSTEM("WMS"); + qpmes062Request.getHEAD().setINTF_ID("QPMES062"); + qpmes062Request.getHEAD().setSRC_MSGID(IdUtil.simpleUUID()); + qpmes062Request.getHEAD().setSRC_SYSTEM("AGV"); + List qpmes062RequestBodyList=new ArrayList<>(); + QPMES062RequestBody qpmes062RequestBody=new QPMES062RequestBody(); + qpmes062RequestBody.setSimtOrderNo(materialList.get(0).getSimtOrderNo()); + qpmes062RequestBody.setLocationCode(materialList.get(0).getLocationCode()); + qpmes062RequestBody.setSimtType(materialList.get(0).getSimtType()); + qpmes062RequestBody.setDeliveryNo(materialList.get(0).getDeliveryNo()); + qpmes062RequestBody.setWhlCode(materialList.get(0).getWhlCode()); + qpmes062RequestBody.setPalletSn(materialList.get(0).getPalletSN()); + qpmes062RequestBody.setUserCode(materialList.get(0).getSupplierCode()); + qpmes062RequestBody.setUserName(materialList.get(0).getSupplierName()); + qpmes062RequestBodyList.add(qpmes062RequestBody); + qpmes062Request.setBODY(qpmes062RequestBodyList); + log.info("开始调用QPMES062服务，入参{}",qpmes062Request.toString()); + String resultMsg = HttpRequest.post(url) + .body(JSON.toJSONString(qpmes062Request)) + .execute().body(); + log.info("QPMES062服务调用成功，反馈{}",resultMsg); }else{ log.error("当前子托盘:"+taskObj.getVehicle_code2()+"不存在未解绑的物料信息，请确认！"); }