From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
index c642e7f..9016d93 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
@@ -51,6 +51,9 @@
if ("Y".equalsIgnoreCase(m.getPauseMk())) {
continue;
}
+ if (requiresOutboundErpConfirm(m) && !"Y".equalsIgnoreCase(m.getPdcType())) {
+ continue;
+ }
if (m.getUpdMk() != null && "WCS_SENT".equalsIgnoreCase(m.getUpdMk())) {
continue;
}
@@ -88,8 +91,11 @@
if (m.getIoPri() != null) {
t.put("taskPri", m.getIoPri().intValue());
}
- t.put("batchSeq", m.getPltType());
- if (m.getUserNo() != null) {
+ // 7.11锛歴eq=0 琛ㄧず鏃犲簭锛學CS 涓嬪彂涓嶄紶 batch 鍜� batchSeq銆�
+ if (m.getPltType() != null && m.getPltType() > 0) {
+ t.put("batchSeq", m.getPltType());
+ }
+ if (m.getPltType() != null && m.getPltType() > 0 && m.getUserNo() != null) {
t.put("batch", m.getUserNo());
}
tasks.add(t);
@@ -139,4 +145,9 @@
}
return SUCCESS;
}
+
+ private boolean requiresOutboundErpConfirm(WrkMast wrkMast) {
+ Integer ioType = wrkMast == null ? null : wrkMast.getIoType();
+ return ioType != null && (ioType == 101 || ioType == 103 || ioType == 104 || ioType == 107 || ioType == 110);
+ }
}
--
Gitblit v1.9.1