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-06 18:27:13 +08:00
parent df534d863a
commit e31579cea6
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +1,27 @@
package org.nl.wms.mes.domain; package org.nl.wms.mes.domain;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
@Data @Data
public class Head { public class Head {
// 接口名称 // 接口名称
@JSONField(name = "INTF_ID")
private String INTF_ID; private String INTF_ID;
// 源系统 // 源系统
@JSONField(name = "SRC_SYSTEM")
private String SRC_SYSTEM; private String SRC_SYSTEM;
// 目标系统 // 目标系统
@JSONField(name = "DEST_SYSTEM")
private String DEST_SYSTEM; private String DEST_SYSTEM;
// 消息ID // 消息ID
@JSONField(name = "SRC_MSGID")
private String SRC_MSGID; private String SRC_MSGID;
// 控制预留1 // 控制预留1
@JSONField(name = "BACKUP1")
private String BACKUP1; private String BACKUP1;
// 控制预留2 // 控制预留2
@JSONField(name = "BACKUP2")
private String BACKUP2; private String BACKUP2;
} }

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

@@ -135,7 +135,7 @@ public class YCLCKTask extends AbstractTask {
return schBasePoint; return schBasePoint;
} }
if (schBasePoint.getIs_used() if (schBasePoint.getIs_used()
&& schBasePoint.getVehicle_qty() == 0) { && schBasePoint.getVehicle_qty() == 0 &&ObjectUtil.isEmpty(schBasePoint.getIng_task_code())) {
log.info("原材料出库任务找到当前符合条件的缓存区位置{}", schBasePoint.getPoint_code()); log.info("原材料出库任务找到当前符合条件的缓存区位置{}", schBasePoint.getPoint_code());
return schBasePoint; return schBasePoint;
} }
@@ -248,6 +248,7 @@ public class YCLCKTask extends AbstractTask {
qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty())); qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty()));
qpmes065RequestBody.setSiteName(material.getLocationCode()); qpmes065RequestBody.setSiteName(material.getLocationCode());
qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0"); qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0");
qpmes065RequestBody.setZXXV02(taskObj.getVehicle_code());
qpmes065RequestBodyList.add(qpmes065RequestBody); qpmes065RequestBodyList.add(qpmes065RequestBody);
} }
qpmes065Request.setBODY(qpmes065RequestBodyList); qpmes065Request.setBODY(qpmes065RequestBodyList);

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

@@ -125,7 +125,7 @@ public class YCLRKTask extends AbstractTask {
List<SchBasePoint> schBasePointList = pointMapper.findPointByRegion(regionCode, "0"); List<SchBasePoint> schBasePointList = pointMapper.findPointByRegion(regionCode, "0");
for (SchBasePoint schBasePoint : schBasePointList) { for (SchBasePoint schBasePoint : schBasePointList) {
if (schBasePoint.getIs_used() if (schBasePoint.getIs_used()
&& schBasePoint.getVehicle_qty() ==0) { && schBasePoint.getVehicle_qty() ==0 &&ObjectUtil.isEmpty(schBasePoint.getIng_task_code())) {
log.info("原材料入库找到当前符合条件的点位{}", schBasePoint.getPoint_code()); log.info("原材料入库找到当前符合条件的点位{}", schBasePoint.getPoint_code());
return schBasePoint; return schBasePoint;
} }