root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2024-04-01 10:34:36 +08:00
parent 43921ffb6b
commit 3e515134c0
8 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES060Response.java
View File

@@ -1,8 +1,10 @@
package org.nl.wms.mes.domain; package org.nl.wms.mes.domain;
import lombok.Data; import lombok.Data;
import lombok.ToString;
@Data @Data
@ToString
public class QPMES060Response extends Public { public class QPMES060Response extends Public {
// 消息状态 // 消息状态
private String STATUS; private String STATUS;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES098Response.java
View File

@@ -1,8 +1,10 @@
package org.nl.wms.mes.domain; package org.nl.wms.mes.domain;
import lombok.Data; import lombok.Data;
import lombok.ToString;
@Data @Data
@ToString
public class QPMES098Response extends Public { public class QPMES098Response extends Public {
//消息状态 //消息状态
private String STATUS; private String STATUS;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java
View File

@@ -1,10 +1,12 @@
package org.nl.wms.mes.domain; package org.nl.wms.mes.domain;
import lombok.Data; import lombok.Data;
import lombok.ToString;
import java.util.List; import java.util.List;
@Data @Data
@ToString
public class QPMES118Response extends Public { public class QPMES118Response extends Public {
private List<QPMES118ResponseBody> BODY; private List<QPMES118ResponseBody> BODY;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118ResponseBody.java
View File

@@ -1,8 +1,10 @@
package org.nl.wms.mes.domain; package org.nl.wms.mes.domain;
import lombok.Data; import lombok.Data;
import lombok.ToString;
@Data @Data
@ToString
public class QPMES118ResponseBody{ public class QPMES118ResponseBody{
//库区 //库区
private String WhaCode; private String WhaCode;

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.mes.webservice.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.util.IdUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.wms.mes.domain.QPMES060Request; import org.nl.wms.mes.domain.QPMES060Request;
import org.nl.wms.mes.domain.QPMES060Response; import org.nl.wms.mes.domain.QPMES060Response;
@@ -29,11 +30,17 @@ public class QPMES060ServiceImpl implements QPMES060Service {
@Override @Override
public QPMES060Response QPMES060(QPMES060Request notice){ public QPMES060Response QPMES060(QPMES060Request notice){
log.info("服务被调用 参数：" + notice.toString()); log.info("QPMES060服务被调用,输入参数：" + notice.toString());
Material material=new Material(); Material material=new Material();
material.copyFrom(notice); material.copyFrom(notice);
material.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); material.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
materialMapper.insert(material); materialMapper.insert(material);
return new QPMES060Response(); 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;
} }
} }

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.mes.webservice.service.impl; package org.nl.wms.mes.webservice.service.impl;
import cn.hutool.core.util.IdUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.wms.mes.domain.QPMES118Response; import org.nl.wms.mes.domain.QPMES118Response;
import org.nl.wms.mes.domain.QPMES118ResponseBody; import org.nl.wms.mes.domain.QPMES118ResponseBody;
@@ -29,10 +30,10 @@ public class QPMES118ServiceImpl implements QPMES118Service {
QPMES118Response qpmes118Response =new QPMES118Response(); QPMES118Response qpmes118Response =new QPMES118Response();
List<QPMES118ResponseBody> body=pointMapper.queryByMes(); List<QPMES118ResponseBody> body=pointMapper.queryByMes();
qpmes118Response.setBODY(body); qpmes118Response.setBODY(body);
qpmes118Response.setDEST_SYSTEM("1"); qpmes118Response.setDEST_SYSTEM("WMS");
qpmes118Response.setINTF_ID("1"); qpmes118Response.setINTF_ID("QPMES118");
qpmes118Response.setSRC_MSGID("1"); qpmes118Response.setSRC_MSGID(IdUtil.simpleUUID());
qpmes118Response.setSRC_SYSTEM("1"); qpmes118Response.setSRC_SYSTEM("AGV");
log.info("QPMES118服务被调用"); log.info("QPMES118服务被调用");
return qpmes118Response; return qpmes118Response;
} }

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
View File

@@ -229,12 +229,12 @@ public class YCLCKTask extends AbstractTask {
if (ObjectUtil.isNotEmpty(materialList)) { if (ObjectUtil.isNotEmpty(materialList)) {
PdmBdWorkorder pdmBdWorkorder=workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>() PdmBdWorkorder pdmBdWorkorder=workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
.eq(PdmBdWorkorder::getMaterial_code, materialList.get(0).getProductName())); .eq(PdmBdWorkorder::getMaterial_code, materialList.get(0).getProductName()));
String url = "http://11.111.11.111:9556/xxx/ws/powerAlarmWs"; String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES065";
QPMES065Request qpmes065Request = new QPMES065Request(); QPMES065Request qpmes065Request = new QPMES065Request();
qpmes065Request.setDEST_SYSTEM("1"); qpmes065Request.setDEST_SYSTEM("WMS");
qpmes065Request.setINTF_ID("1"); qpmes065Request.setINTF_ID("QPMES065");
qpmes065Request.setSRC_MSGID("1"); qpmes065Request.setSRC_MSGID(IdUtil.simpleUUID());
qpmes065Request.setSRC_SYSTEM("1"); qpmes065Request.setSRC_SYSTEM("AGV");
qpmes065Request.setMoname(pdmBdWorkorder.getWorkorder_code()); qpmes065Request.setMoname(pdmBdWorkorder.getWorkorder_code());
qpmes065Request.setLotSN(materialList.get(0).getPalletSN()); qpmes065Request.setLotSN(materialList.get(0).getPalletSN());
qpmes065Request.setQty(String.valueOf(one.getMaterial_qty())); qpmes065Request.setQty(String.valueOf(one.getMaterial_qty()));

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
View File

@@ -206,12 +206,12 @@ public class YCLRKTask extends AbstractTask {
try { try {
//todo 待确认具体传值 //todo 待确认具体传值
if(ObjectUtil.isNotEmpty(materialList)) { if(ObjectUtil.isNotEmpty(materialList)) {
String url = "http://11.111.11.111:9556/xxx/ws/powerAlarmWs"; String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES062 ";
QPMES062Request qpmes062Request = new QPMES062Request(); QPMES062Request qpmes062Request = new QPMES062Request();
qpmes062Request.setDEST_SYSTEM("1"); qpmes062Request.setDEST_SYSTEM("WMS");
qpmes062Request.setINTF_ID("1"); qpmes062Request.setINTF_ID("QPMES062");
qpmes062Request.setSRC_MSGID("1"); qpmes062Request.setSRC_MSGID(IdUtil.simpleUUID());
qpmes062Request.setSRC_SYSTEM("1"); qpmes062Request.setSRC_SYSTEM("AGV");
qpmes062Request.setSimtOrderNo(materialList.get(0).getSimtOrderNo()); qpmes062Request.setSimtOrderNo(materialList.get(0).getSimtOrderNo());
qpmes062Request.setLocationCode(materialList.get(0).getLocationCode()); qpmes062Request.setLocationCode(materialList.get(0).getLocationCode());
qpmes062Request.setSimtType(materialList.get(0).getSimtType()); qpmes062Request.setSimtType(materialList.get(0).getSimtType());