From f84b757103683b1c7b19fa7d6ac9bf55b8512efc Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 16:48:18 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 12 +++++++++---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java | 2 +-
rsf-open-api/src/main/resources/application-dev.yml | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java | 20 ++++++++++++++------
4 files changed, 25 insertions(+), 11 deletions(-)
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 f6c7874..3b307d9 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
@@ -96,14 +96,18 @@
if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_IN.code)){
wcsUrl = wcsUrl + WcsConstant.createInTask;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
- missionWcsTaskIssueParam.setLocNo(param.getLocNo());
+ String[] split = param.getLocNo().split("-");
+ String endLoc = split[2]+"-"+split[3]+"-"+split[4];
+ missionWcsTaskIssueParam.setLocNo(endLoc);
missionWcsTaskIssueParam.setBarcode(param.getBarcode());
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
} else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_OUT.code)){
wcsUrl = wcsUrl + WcsConstant.createOutTask;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
- missionWcsTaskIssueParam.setLocNo(param.getSourceCode());
+ String[] split = param.getSourcelocNo().split("-");
+ String souLoc = split[2]+"-"+split[3]+"-"+split[4];
+ missionWcsTaskIssueParam.setLocNo(souLoc);
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//鐩爣绔�
missionWcsTaskIssueParam.setOutArea("");//鐩爣鍖哄煙
@@ -112,8 +116,12 @@
} else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_TRANSFER.code)){
wcsUrl = wcsUrl + WcsConstant.createLocMoveTask;
missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
- missionWcsTaskIssueParam.setSourceLocNo(param.getSourcelocNo());
- missionWcsTaskIssueParam.setLocNo(param.getLocNo());
+ String[] split1 = param.getSourcelocNo().split("-");
+ String souLoc = split1[2]+"-"+split1[3]+"-"+split1[4];
+ missionWcsTaskIssueParam.setSourceLocNo(souLoc);
+ String[] split2 = param.getLocNo().split("-");
+ String endLoc = split2[2]+"-"+split2[3]+"-"+split2[4];
+ missionWcsTaskIssueParam.setLocNo(endLoc);
missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
} else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_STA.code)){
wcsUrl = wcsUrl + WcsConstant.STA_TO_STA;
@@ -122,11 +130,11 @@
missionWcsTaskIssueParam.setSourceStaNo(Integer.parseInt(param.getSourcestaNo()));//鐩爣绔�
}
/**WMS鍩虹閰嶇疆閾炬帴*/
- log.info("鍏ュ簱浠诲姟鐢宠锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", wcsUrl , JSONObject.toJSONString(param));
+ log.info("鍏ュ簱浠诲姟鐢宠锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", wcsUrl , JSONObject.toJSONString(missionWcsTaskIssueParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
- HttpEntity httpEntity = new HttpEntity(param, headers);
+ HttpEntity httpEntity = new HttpEntity(missionWcsTaskIssueParam, headers);
ResponseEntity<String> exchange = restTemplate.exchange(wcsUrl, HttpMethod.POST, httpEntity, String.class);
log.info("WCS浠诲姟鐢宠锛屽搷搴旂粨鏋滐細 {}", exchange);
if (Objects.isNull(exchange.getBody())) {
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index 65181b0..2ad8d5f 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -66,7 +66,7 @@
#WCS閾炬帴
wcs:
#閾炬帴
- host: http://192.168.4.178
+ host: http://192.168.4.198
#绔彛
port: 9090
#WCS閾炬帴
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
index 4095457..c8e6c71 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
@@ -11,7 +11,7 @@
private List<Long> type;
private Long orderItemId;//璁㈠崟鏄庣粏ID
- private Long waveId = 16L;//鍑哄簱绛栫暐
+ private Long waveId = 15L;//鍑哄簱绛栫暐
private List<Detl> detlList;
class Detl{
private String loc_no;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index ceb9243..de36011 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -988,8 +988,14 @@
//110.绌烘澘鍑哄簱
complateOutStockEmpty(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)) {
- //110.绌烘澘鍑哄簱
+ //109.瓒婂簱
complateOutStockDocking(task, loginUserId);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ //107.鐩�
+ pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ //103.鎷ｉ��
+ pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_PICK);
} else {
complateOutStock(task, loginUserId);
}
@@ -1362,7 +1368,7 @@
task.setTaskCode(ruleCode)
.setTaskType(type)
.setBarcode(task.getBarcode())
- .setTaskStatus(TaskStsType.GENERATE_IN.id);
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id);
TaskInParam param = new TaskInParam();
param.setSourceStaNo(task.getTargSite())
@@ -1617,7 +1623,7 @@
/**
* @author Ryan
* @date 2025/5/20
- * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
+ * @description: 瀹屾垚瓒婂簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
* @version 1.0
*/
@Synchronized
--
Gitblit v1.9.1