From e31579cea6fe02767973b347c8944e5a54175991 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Sat, 6 Apr 2024 18:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/org/nl/wms/mes/domain/Head.java | 7 +++++++
.../org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java | 3 ++-
.../org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java
index 9a8d8dd..8d12de6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/Head.java
@@ -1,20 +1,27 @@
package org.nl.wms.mes.domain;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class Head {
// 接口名称
+ @JSONField(name = "INTF_ID")
private String INTF_ID;
// 源系统
+ @JSONField(name = "SRC_SYSTEM")
private String SRC_SYSTEM;
// 目标系统
+ @JSONField(name = "DEST_SYSTEM")
private String DEST_SYSTEM;
// 消息ID
+ @JSONField(name = "SRC_MSGID")
private String SRC_MSGID;
// 控制预留1
+ @JSONField(name = "BACKUP1")
private String BACKUP1;
// 控制预留2
+ @JSONField(name = "BACKUP2")
private String BACKUP2;
}
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 be51633..19f4b7a 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
@@ -135,7 +135,7 @@ public class YCLCKTask extends AbstractTask {
return schBasePoint;
}
if (schBasePoint.getIs_used()
- && schBasePoint.getVehicle_qty() == 0) {
+ && schBasePoint.getVehicle_qty() == 0 &&ObjectUtil.isEmpty(schBasePoint.getIng_task_code())) {
log.info("原材料出库任务找到当前符合条件的缓存区位置{}", schBasePoint.getPoint_code());
return schBasePoint;
}
@@ -248,6 +248,7 @@ public class YCLCKTask extends AbstractTask {
qpmes065RequestBody.setQty(String.valueOf(one.getMaterial_qty()));
qpmes065RequestBody.setSiteName(material.getLocationCode());
qpmes065RequestBody.setZXXV01(extGroupData.getString("workorder_code")!=null?"1":"0");
+ qpmes065RequestBody.setZXXV02(taskObj.getVehicle_code());
qpmes065RequestBodyList.add(qpmes065RequestBody);
}
qpmes065Request.setBODY(qpmes065RequestBodyList);
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 bec192f..99d617b 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
@@ -125,7 +125,7 @@ public class YCLRKTask extends AbstractTask {
List<SchBasePoint> schBasePointList = pointMapper.findPointByRegion(regionCode, "0");
for (SchBasePoint schBasePoint : schBasePointList) {
if (schBasePoint.getIs_used()
- && schBasePoint.getVehicle_qty() ==0) {
+ && schBasePoint.getVehicle_qty() ==0 &&ObjectUtil.isEmpty(schBasePoint.getIng_task_code())) {
log.info("原材料入库找到当前符合条件的点位{}", schBasePoint.getPoint_code());
return schBasePoint;
}