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

联调优化

Browse Source
This commit is contained in:
psh
2024-04-05 14:20:24 +08:00
parent 9fc0a2feb9
commit 083286e37c
17 changed files with 248 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,7 +19,9 @@ import java.util.List;
@XmlRootElement
@Accessors(chain = true)
public class QPMES062Request{
@JSONField(name = "HEAD")
private Head HEAD;
@JSONField(name = "BODY")
private List<QPMES062RequestBody> BODY;
}

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

@@ -1,27 +1,36 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.*;
import lombok.experimental.Accessors;
import javax.xml.bind.annotation.XmlRootElement;
@Data
public class QPMES062RequestBody extends Head {
public class QPMES062RequestBody {
//入库单号
@JSONField(name = "SimtOrderNo")
private String SimtOrderNo;
//场地
@JSONField(name = "locationCode")
private String locationCode;
//入库类型
@JSONField(name = "simtType")
private String simtType;
//到货单号
@JSONField(name = "deliveryNo")
private String deliveryNo;
//扫描库位
@JSONField(name = "whlCode")
private String whlCode;
//物料条码号（托号）
@JSONField(name = "PalletSn")
private String PalletSn;
//用户编码
@JSONField(name = "userCode")
private String userCode;
//用户名称
@JSONField(name = "userName")
private String userName;
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,6 +19,8 @@ import java.util.List;
@XmlRootElement
@Accessors(chain = true)
public class QPMES065Request {
@JSONField(name = "HEAD")
private Head HEAD;
@JSONField(name = "BODY")
private List<QPMES065RequestBody> BODY;
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.*;
import lombok.experimental.Accessors;
@@ -9,32 +10,46 @@ import javax.xml.bind.annotation.XmlRootElement;
public class QPMES065RequestBody {
//工单号
@JSONField(name = "moname")
private String moname;
//物料条码（托号）
@JSONField(name = "lotSN")
private String lotSN;
//领料数量
@JSONField(name = "qty")
private String qty;
//场地
@JSONField(name = "siteName")
private String siteName;
//预留字段1
@JSONField(name = "ZXXV01")
private String ZXXV01;
//预留字段2
@JSONField(name = "ZXXV02")
private String ZXXV02;
//预留字段3
@JSONField(name = "ZXXV03")
private String ZXXV03;
//预留字段4
@JSONField(name = "ZXXV04")
private String ZXXV04;
//预留字段5
@JSONField(name = "ZXXV05")
private String ZXXV05;
//预留字段6
@JSONField(name = "ZXXV06")
private String ZXXV06;
//预留字段7
@JSONField(name = "ZXXV07")
private String ZXXV07;
//预留字段8
@JSONField(name = "ZXXV08")
private String ZXXV08;
//预留字段9
@JSONField(name = "ZXXV09")
private String ZXXV09;
//预留字段10
@JSONField(name = "ZXXV10")
private String ZXXV10;
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.ToString;
@@ -8,7 +9,9 @@ import java.util.List;
@Data
@ToString
public class QPMES118Response{
@JSONField(name = "HEAD")
private Head HEAD;
@JSONField(name = "BODY")
private List<QPMES118ResponseBody> BODY;
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.ToString;
@@ -7,20 +8,28 @@ import lombok.ToString;
@ToString
public class QPMES118ResponseBody{
//库区
@JSONField(name = "WhaCode")
private String WhaCode;
//库位
@JSONField(name = "WhlCode")
private String WhlCode;
//客户
@JSONField(name = "CustomerName")
private String CustomerName;
//母托号
@JSONField(name = "ParentPalletSN")
private String ParentPalletSN;
//子托号
@JSONField(name = "PalletSN")
private String PalletSN;
//物料编码
@JSONField(name = "ProductName")
private String ProductName;
//入库日期
@JSONField(name = "WorkDate")
private String WorkDate;
//重量
@JSONField(name = "Qty")
private String Qty;
}

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

@@ -75,6 +75,14 @@ public class POINTTask extends AbstractTask {
task.setRemark("");
SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getPoint_code, task.getPoint_code1()));
if(task.getPoint_code2().startsWith("DKT")){
SchBasePoint nextSchBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getPoint_code, task.getPoint_code2()));
//如果是叠盘位，根据当前数量+1为目标地址
int qty=nextSchBasePoint.getVehicle_qty()+1;
log.info("当前叠盘位完成任务次数为");
task.setPoint_code2(task.getPoint_code2().substring(0,task.getPoint_code2().length()-1)+qty);
}
task.setVehicle_code(schBasePoint.getVehicle_code());
task.setVehicle_code2(schBasePoint.getVehicle_code2());
taskService.update(task);
@@ -115,6 +123,9 @@ public class POINTTask extends AbstractTask {
}
String startPoint = taskObj.getPoint_code1(); // 获取起点
String endPoint = taskObj.getPoint_code2(); // 获取终点
if(endPoint.startsWith("DKT")){
endPoint=endPoint.substring(0,endPoint.length()-1)+1;
}
SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint);
// 根据传来的类型去对任务进行操作
@@ -163,7 +174,11 @@ public class POINTTask extends AbstractTask {
endPointObj.setIng_task_code("");
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
endPointObj.setVehicle_qty(1);
if(endPointObj.getPoint_code().startsWith("DKT")){
endPointObj.setVehicle_qty(endPointObj.getVehicle_qty()+1);
}else {
endPointObj.setVehicle_qty(1);
}
pointService.update(endPointObj);
// 起点清空
startPointObj.setVehicle_code("");

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

@@ -233,24 +233,27 @@ public class YCLCKTask extends AbstractTask {
String url = "http://192.168.9.5/sitAppWebApi/PDSToWMS/Api/QPMES065";
QPMES065Request qpmes065Request = new QPMES065Request();
List<QPMES065RequestBody> qpmes065RequestBodyList=new ArrayList<>();
QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody();
Head head=new Head();
head.setDEST_SYSTEM("WMS");
head.setINTF_ID("QPMES065");
head.setSRC_MSGID(IdUtil.simpleUUID());
head.setSRC_SYSTEM("AGV");
qpmes065Request.setHEAD(head);
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);
for(Material material:materialList) {
QPMES065RequestBody qpmes065RequestBody=new QPMES065RequestBody();
qpmes065RequestBody.setMoname(pdmBdWorkorder!=null?pdmBdWorkorder.getWorkorder_code():null);
qpmes065RequestBody.setLotSN(material.getPalletSN());
qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty()));
qpmes065RequestBody.setSiteName(material.getLocationCode());
qpmes065RequestBody.setZXXV01(pdmBdWorkorder!=null?"1":"0");
qpmes065RequestBodyList.add(qpmes065RequestBody);
}
qpmes065Request.setBODY(qpmes065RequestBodyList);
log.info("开始调用QPMES065服务，入参{}",qpmes065Request.toString());
log.info("开始调用QPMES065服务，入参{}",JSON.toJSONString(qpmes065Request));
String resultMsg = HttpRequest.post(url)
.body(JSON.toJSONString(qpmes065Request))
.execute().body();
log.info("QPMES062服务调用成功，反馈{}",resultMsg);
log.info("QPMES065服务调用成功，反馈{}",resultMsg);
} else {
log.error("当前子托盘:" + taskObj.getVehicle_code2() + "不存在未解绑的物料信息，请确认！");
}

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

@@ -215,18 +215,20 @@ public class YCLRKTask extends AbstractTask {
head.setSRC_SYSTEM("AGV");
qpmes062Request.setHEAD(head);
List<QPMES062RequestBody> 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);
for(Material material:materialList) {
QPMES062RequestBody qpmes062RequestBody = new QPMES062RequestBody();
qpmes062RequestBody.setSimtOrderNo(material.getSimtOrderNo());
qpmes062RequestBody.setLocationCode(material.getLocationCode());
qpmes062RequestBody.setSimtType(material.getSimtType());
qpmes062RequestBody.setDeliveryNo(material.getDeliveryNo());
qpmes062RequestBody.setWhlCode(material.getWhlCode());
qpmes062RequestBody.setPalletSn(material.getLotSN());
qpmes062RequestBody.setUserCode(material.getSupplierCode());
qpmes062RequestBody.setUserName(material.getSupplierName());
qpmes062RequestBodyList.add(qpmes062RequestBody);
}
qpmes062Request.setBODY(qpmes062RequestBodyList);
log.info("开始调用QPMES062服务，入参{}",qpmes062Request.toString());
log.info("开始调用QPMES062服务，入参{}",JSON.toJSONString(qpmes062Request));
String resultMsg = HttpRequest.post(url)
.body(JSON.toJSONString(qpmes062Request))
.execute().body();

2
lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
View File

@@ -6,7 +6,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:cw_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:gc_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}

26
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -57,43 +57,43 @@ https://juejin.cn/post/6844903775631572999
<!--开发环境:打印控制台-->
<springProfile name="dev">
<root level="debug">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.apache" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="io.netty" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="jdbc" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="io.lettuce" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.fasterxml" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.quartz" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.google" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="springfox" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="log4jdbc" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="nl.basjes" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile>