From 4c418a889f3b3a0874eb7836d72a9abef174f79b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 27 二月 2026 15:31:40 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java | 4 ++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 6 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java | 6 ++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java | 10 ++++++----
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java | 18 ++++++++++++++++++
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java
index c102448..60d0b22 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionTaskIssueParam.java
@@ -14,6 +14,10 @@
private String taskNo;
private String barcode;//鏉＄爜
private Integer taskPri;//浼樺厛绾�
+ private String locNo;//鐩爣搴撲綅
+ private String sourcelocNo;//婧愬簱浣�
+ private String staNo;//鐩爣绔欑偣
+ private String sourcestaNo;//婧愮珯鐐�
/*
* 绫诲瀷锛氬嚭搴撱�佸叆搴撱�佺Щ搴撱�佺珯鍒扮珯
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java
index f21e82b..3d9e462 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/MissionWcsTaskIssueParam.java
@@ -77,4 +77,22 @@
* */
private String barcode;
+ //鍏ュ簱 **********************************************************************
+// /**
+// * WMS浠诲姟鍙� 宸ヤ綔鍙�
+// */
+// private String taskNo;
+// /*
+// * 鏉＄爜
+// * */
+// private String barcode;
+ /*
+ * 婧愮珯
+ * */
+ private Integer sourceStaNo;
+// /*
+// * 鐩爣绔欙紙浼樺厛绾ч珮浜庡嚭搴撳尯鍩燂級
+// * */
+// private Integer staNo;
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
index ace00bd..4ccf160 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
@@ -95,7 +95,7 @@
if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_IN.code)){
wcsUrl = wcsUrl + WcsConstant.createInTask;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
- missionWcsTaskIssueParam.setLocNo(param.getTargetCode());
+ missionWcsTaskIssueParam.setLocNo(param.getLocNo());
missionWcsTaskIssueParam.setBarcode(param.getBarcode());
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
@@ -104,19 +104,21 @@
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
missionWcsTaskIssueParam.setLocNo(param.getSourceCode());
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
- missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getTargetCode()));//鐩爣绔�
+ missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//鐩爣绔�
missionWcsTaskIssueParam.setOutArea("");//鐩爣鍖哄煙
missionWcsTaskIssueParam.setBatch("");//鍑哄簱鎵规鍙�
missionWcsTaskIssueParam.setBatchSeq(1);//鍑哄簱椤哄簭鍙�
} else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_TRANSFER.code)){
wcsUrl = wcsUrl + WcsConstant.createLocMoveTask;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
- missionWcsTaskIssueParam.setSourceLocNo(param.getSourceCode());
- missionWcsTaskIssueParam.setLocNo(param.getTargetCode());
+ missionWcsTaskIssueParam.setSourceLocNo(param.getSourcelocNo());
+ missionWcsTaskIssueParam.setLocNo(param.getLocNo());
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
} else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_STA.code)){
wcsUrl = wcsUrl + WcsConstant.STA_TO_STA;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
+ missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//鐩爣绔�
+ missionWcsTaskIssueParam.setSourceStaNo(Integer.parseInt(param.getSourcestaNo()));//鐩爣绔�
}
/**WMS鍩虹閰嶇疆閾炬帴*/
log.info("鍏ュ簱浠诲姟鐢宠锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", wcsUrl , JSONObject.toJSONString(param));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java
index 7f53ad0..79fc79e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/MissionTaskIssueParam.java
@@ -19,6 +19,12 @@
* WMS浠诲姟鍙�
*/
private String taskNo;
+ private String barcode;//鏉＄爜
+ private Integer taskPri;//浼樺厛绾�
+ private String locNo;//鐩爣搴撲綅
+ private String sourcelocNo;//婧愬簱浣�
+ private String staNo;//鐩爣绔欑偣
+ private String sourcestaNo;//婧愮珯鐐�
/*
* 绫诲瀷锛氬嚭搴撱�佸叆搴撱�佺Щ搴撱�佺珯鍒扮珯
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 1861750..28ef1fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -179,6 +179,12 @@
missionTaskIssueParam.setSourceCode(taskInstance.getSourceCode());
missionTaskIssueParam.setTargetCode(taskInstance.getTargetCode());
+ missionTaskIssueParam.setLocNo(task.getTargLoc());
+ missionTaskIssueParam.setSourcelocNo(task.getOrgLoc());
+ missionTaskIssueParam.setSourcestaNo(task.getOrgSite());
+ missionTaskIssueParam.setStaNo(task.getTargSite());
+ missionTaskIssueParam.setBarcode(task.getBarcode());
+ missionTaskIssueParam.setTaskPri(task.getSort());
/**浠诲姟涓嬪彂鎺ュ彛*/
String pubTakUrl = wmsOpenApi.getHost() + ":" + wmsOpenApi.getPort() + RcsConstant.MISSION_TRANSFER_STATION;
--
Gitblit v1.9.1