From 10e6a9a8adad2226f13a4e4704ca5b2ad5b9ef9a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:49:59 +0800
Subject: [PATCH] 刀具库WMS功能完善
---
src/main/java/com/zy/asrs/task/handler/JlerHandler.java | 256 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 246 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
index 3c09955..0b401b5 100644
--- a/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/JlerHandler.java
@@ -1,19 +1,27 @@
package com.zy.asrs.task.handler;
-import com.zy.asrs.entity.WrkMast;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.rcs.RcsReturn;
import com.zy.asrs.entity.rcs.RcsTaskSubmit;
import com.zy.asrs.entity.rcs.RcsTaskTargetRoute;
-import com.zy.asrs.service.RcsService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* @author pang.jiabao
@@ -30,6 +38,30 @@
@Resource
private RcsService rcsService;
+ @Resource
+ private OrderPakoutService orderPakoutService;
+
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Resource
+ private LocDetlService locDetlService;
+
+ @Resource
+ private LocMastService locMastService;
+
+ @Resource
+ private StaDescService staDescService;
+
+ @Value("${mes.defaultUserId}")
+ public long defaultUserId;
+
+ @Resource
+ private CommonService commonService;
+
+ @Resource
+ private WrkDetlService wrkDetlService;
+
@Transactional
public void callAgvToWarehouse(WrkMast wrkMast) {
@@ -42,7 +74,7 @@
List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
startRoute.setSeq(0);
- startRoute.setCode("106");
+ startRoute.setCode(wrkMast.getStaNo());
startRoute.setOperation("COLLECT");
startRoute.setType("SITE");
targetRouteList.add(startRoute);
@@ -57,14 +89,218 @@
// 杞彂缁欐捣搴锋垨鍗庢檽RCS
RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, 1);
if (rcsReturn.getCode().equals("SUCCESS")) {
+ Date now = new Date();
wrkMast.setWrkSts(3L);
- wrkMast.setModiTime(new Date());
+ wrkMast.setModiTime(now);
+ wrkMast.setCrnStrTime(now);
wrkMast.setTaskNo(rcsTaskSubmit.getRobotTaskCode());
wrkMastService.updateById(wrkMast);
- log.info("鍏ュ簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゆ垚鍔燂紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+ log.info("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゆ垚鍔燂紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
} else {
- log.error("鍏ュ簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゅけ璐ワ紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+ log.error("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゅけ璐ワ紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
}
}
+ /**
+ * 鏍规嵁鍑哄簱璁㈠崟鑷姩鐢熸垚鍑哄簱浠诲姟
+ */
+ @Transactional
+ public void autoGenerateOutTask(OrderPakout orderPakout) {
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
+
+ List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
+ for (OrderDetlPakout orderDetl : orderDetlPakouts) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ locDto.setFrozen(locDetl.getFrozen());
+ locDto.setFrozenLoc(locMast.getFrozen());
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+// locDto.setStaNos(staNos);
+ locDto.setStaNo(103);
+ locDto.setBrand(orderDetl.getBrand());
+
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setBrand(orderDetl.getBrand());
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ }
+ }
+
+ List<LocDto> locDtoArrayList = new ArrayList<>();
+ //
+ for (LocDto locDto : locDtos){
+ if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1 && !locDto.isLack()){
+ locDtoArrayList.add(locDto);
+ } else {
+ log.warn("搴撲綅/搴撳瓨琚喕缁撴垨搴撳瓨涓嶈冻:{}", JSONObject.toJSONString(locDto));
+ }
+ }
+ locDtos = locDtoArrayList;
+
+ List<TaskDto> taskDtos = new ArrayList<>();
+ // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+ for (LocDto locDto : locDtos) {
+ if (locDto.isLack()) { continue; }
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ // -----------------------------------------------------------------------------------------------
+ long userId = defaultUserId;
+ for (TaskDto taskDto : taskDtos) {
+ Date now = new Date();
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(taskDto.getLocNo());
+ int ioType = taskDto.isAll() ? 101 : 103;
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo("101"); // 婧愮珯
+ wrkMast.setStaNo("103"); // 鐩爣绔�
+ wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDto locDto : taskDto.getLocDtos()) {
+ if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
+ continue;
+ }
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
+ , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
+
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(orderDetl);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setBatch(locDto.getBatch());
+ wrkDetl.setOrderNo(locDto.getOrderNo());
+ wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setMatnr(orderDetl.getMatnr());
+ wrkDetl.setMaktx(orderDetl.getMaktx());
+ wrkDetl.setSpecs(orderDetl.getSpecs());
+ wrkDetl.setModel(orderDetl.getModel());
+ wrkDetl.setUnit(orderDetl.getUnit());
+ wrkDetl.setThreeCode(String.valueOf(orderPakout.getDocType())); // 鍗曟嵁绫诲瀷,rcs鍙嶉end鍒皐cs鏃剁粰tms涓婃姤鐢�
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()
+ , locDto.getAnfme());
+ log.info("鏍规嵁璁㈠崟鑷姩鐢熸垚鍑哄簱浠诲姟鎴愬姛銆愬伐浣滃彿锛歿}锛岃鍗曞彿锛歿}锛岀墿鏂欙細{}锛屾暟閲忥細{}銆�",workNo,locDto.getOrderNo(),locDto.getMatnr(),locDto.getAnfme());
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(taskDto.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + taskDto.getLocNo());
+ }
+ } else {
+ throw new CoolException(taskDto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderPakout.getId(), 2L, userId);
+ }
+
+ public void outboundCallBinRobot(WrkMast wrkMast) {
+ // 涓嬪彂缁橰CS
+ RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
+ // 妯℃澘鍚�
+ rcsTaskSubmit.setTaskType("F11");
+ rcsTaskSubmit.setRobotTaskCode(String.valueOf(new Date().getTime()));
+ rcsTaskSubmit.setInitPriority(10); //榛樿10
+ List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
+ RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
+ startRoute.setSeq(0);
+ startRoute.setCode(wrkMast.getSourceLocNo());
+ startRoute.setOperation("COLLECT");
+ startRoute.setType("STORAGE");
+ targetRouteList.add(startRoute);
+ RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
+ endRoute.setSeq(1);
+ endRoute.setCode(wrkMast.getSourceStaNo());
+ endRoute.setOperation("DELIVERY");
+ endRoute.setType("SITE");
+ targetRouteList.add(endRoute);
+ rcsTaskSubmit.setTargetRoute(targetRouteList);
+
+ // 杞彂缁欐捣搴锋垨鍗庢檽RCS
+ RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, 1);
+ if (rcsReturn.getCode().equals("SUCCESS")) {
+ Date now = new Date();
+ wrkMast.setWrkSts(12L);
+ wrkMast.setModiTime(now);
+ wrkMast.setCrnStrTime(now);
+ wrkMast.setTaskNo(rcsTaskSubmit.getRobotTaskCode());
+ wrkMastService.updateById(wrkMast);
+ log.info("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゆ垚鍔燂紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+ } else {
+ log.error("鍑哄簱缁欐枡绠辨満鍣ㄤ汉鍙戦�佸懡浠ゅけ璐ワ紝宸ヤ綔鍙凤細{}锛屼换鍔″彿锛歿}",wrkMast.getWrkNo(),rcsTaskSubmit.getRobotTaskCode());
+ }
+ }
}
--
Gitblit v1.9.1