From c9944fa15889ef97236960fcc9370a582cd86267 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 17 三月 2026 14:37:34 +0800
Subject: [PATCH] 1.wcs下发出库任务方式需更改，先采集数据再一次性下发：下发组batch和序号batch_seq 2.库位分配逻辑需优化，目前分配单个巷道 3.
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 10bffd4..b61a4aa 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,15 +1,25 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.api.controller.params.WorkTaskParams;
+import com.zy.api.service.WcsApiService;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.asrs.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -21,6 +31,8 @@
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+ @Autowired
+ private WcsApiService wcsApiService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -45,4 +57,78 @@
}
}
+ /**
+ * 浠诲姟鑷姩涓嬪彂銆�
+ * <p>
+ * 璋冨害鍣ㄥ彧璐熻矗浠庡伐浣滄。涓寫鍑衡�滃綋鍓嶅厑璁镐笅鍙戔�濈殑浠诲姟锛屽苟灏嗗叾杞崲鎴� WCS 鎺ュ彛闇�瑕佺殑鎶ユ枃缁撴瀯锛�
+ * 鐪熸鐨勬壒閲忓垎缁勩�佽皟鐢� WCS銆佷互鍙婁笅鍙戞垚鍔熷悗鐨勭姸鎬佹帹杩涢兘鏀惧湪 service 灞傜粺涓�澶勭悊銆�
+ * <p>
+ * 褰撳墠鎵归噺涓嬪彂鐨勫綊骞剁淮搴︽槸锛�
+ * 1. WCS鎺ュ彛璺緞锛堝叆搴�/鍑哄簱/绉诲簱涓嶈兘娣峰彂锛夛紱
+ * 2. work_mast.user_no锛堢浉鍚� userNo 鐨勪换鍔″繀椤绘斁鍒板悓涓�鎵规涓�璧蜂笂鎶ワ級銆�
+ *
+ * @author Ryan
+ * @date 2026/1/10 14:42
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void autoPubTasks() {
+ // 浠呭鐞嗗緟涓嬪彂/宸茬敓鎴愪笅鍙戝彿鐨勫伐浣滄。銆�
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+
+ // 鎵撴暎椤哄簭锛岄伩鍏嶅浐瀹氭帓搴忎笅鍚屼竴鎵逛换鍔￠暱鏈熷崰鐢ㄨ皟搴︽満浼氥��
+ Collections.shuffle(wrkMasts);
+ List<WorkTaskParams> paramsList = new ArrayList<>();
+ for (WrkMast wrkMast : wrkMasts) {
+ // 鍑哄簱绫讳换鍔★紙ioType > 100锛夐粯璁ら渶瑕� ERP 纭锛涙湭纭鐨勪换鍔″湪杩欓噷鐩存帴璺宠繃銆�
+ if (wrkMast.getIoType()>100&& !wrkMast.getPdcType().equals("Y")) {
+ continue;
+ }
+
+ // WMS 搴撲綅缂栫爜杞崲鎴� WCS 鍙瘑鍒殑搴撲綅缂栫爜銆�
+ String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
+ String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
+ WorkTaskParams params = new WorkTaskParams();
+
+ // 101: 鍑哄簱銆傛澶� batch 瀛楁鎵胯浇 userNo锛屽悗缁� service 灞備細鎹鎶婄浉鍚� userNo 鐨勪换鍔″苟鍒颁竴鎵广��
+ if(wrkMast.getIoType()==101) {
+ params.setType("out")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setLocNo(wcsSourceLocNo)
+ .setStaNo(String.valueOf(wrkMast.getStaNo()))
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBatch(wrkMast.getUserNo())
+ .setBatchSeq(wrkMast.getPltType())
+ .setBarcode(wrkMast.getBarcode());
+ // 2: 鍏ュ簱銆傚叆搴撴帴鍙ｄ娇鐢� sourceStaNo + 鐩爣搴撲綅銆�
+ }else if(wrkMast.getIoType()==2&& !Cools.isEmpty(wrkMast.getSourceStaNo())){
+ params.setType("in")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()))
+ .setLocNo(wcsLocNo)
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBarcode(wrkMast.getBarcode());
+ // 鍏朵綑璧扮Щ搴撴帴鍙ｏ紝婧愬簱浣嶅拰鐩爣搴撲綅閮介渶瑕佸甫缁� WCS銆�
+ } else {
+ params.setType("move")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setSourceLocNo(wcsSourceLocNo)
+ .setLocNo(wcsLocNo)
+ .setBarcode(wrkMast.getBarcode());
+ }
+ paramsList.add(params);
+ }
+ if (paramsList.isEmpty()) {
+ return;
+ }
+
+ // service 灞備細缁х画鎸夆�滄帴鍙ｈ矾寰� + userNo鈥濆垎缁勫悗鍐嶆壒閲忎笂鎶ャ��
+ R r = wcsApiService.pubWrksToWcs(paramsList);
+ if (!r.get("code").equals(200)) {
+ log.warn("鎵归噺涓嬪彂浠诲姟鍒癢CS澶辫触, result={}", r);
+ }
+ }
+
}
--
Gitblit v1.9.1