From da5d4106e294a229e3bf72939c6b7630e6345d76 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 10 三月 2026 10:30:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 310 ++++++++++++++++++++-------------------------------
1 files changed, 120 insertions(+), 190 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b3f4727..15d88ba 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.zy.api.controller.params.StopOutTaskParams;
+import com.zy.api.service.WcsApiService;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -23,7 +25,6 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
-import com.zy.erp.kingdee.utils.PostMesDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -32,6 +33,7 @@
import javax.rmi.CORBA.Util;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/9
@@ -88,6 +90,8 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WcsApiService wcsApiService;
@Override
@Transactional
@@ -359,6 +363,107 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+ }
+
+ @Override
+ @Transactional
+ public R pakoutOrderPause(OpenOrderPakoutPauseParam param) {
+ if (param == null || Cools.isEmpty(param.getOrderNo())) {
+ throw new CoolException("orderNo is empty");
+ }
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (order == null) {
+ order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
+ }
+ if (order == null) {
+ throw new CoolException("order not found: " + param.getOrderNo());
+ }
+
+ List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderNo());
+ if (activeTasks.isEmpty()) {
+ return R.ok("no active out tasks");
+ }
+
+ Date now = new Date();
+ int pausedCount = 0;
+ List<WrkMast> issuedTasks = new ArrayList<>();
+ for (WrkMast wrkMast : activeTasks) {
+ if (wrkMast == null || "Y".equalsIgnoreCase(wrkMast.getPauseMk())) {
+ continue;
+ }
+ wrkMast.setPauseMk("Y");
+ wrkMast.setUpdMk(needNotifyWcsStop(wrkMast) ? "WCS_STOP_REQUESTED" : "WMS_PAUSED");
+ wrkMast.setManuType("ERP_PAUSE");
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(9527L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("pause out task failed: " + wrkMast.getWrkNo());
+ }
+ pausedCount++;
+ if (needNotifyWcsStop(wrkMast)) {
+ issuedTasks.add(wrkMast);
+ }
+ }
+
+ if (pausedCount == 0) {
+ return R.ok("tasks already paused");
+ }
+
+ if (!issuedTasks.isEmpty()) {
+ wcsApiService.pauseOutTasks(buildStopOutTaskParams(param, issuedTasks));
+ }
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderNo());
+ result.put("pausedCount", pausedCount);
+ result.put("wcsStopCount", issuedTasks.size());
+ return R.ok("pause out success").add(result);
+ }
+
+ private List<WrkMast> findActiveOutboundTasks(String orderNo) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ if (wrkDetls == null || wrkDetls.isEmpty()) {
+ return Collections.emptyList();
+ }
+ Set<Integer> wrkNos = wrkDetls.stream()
+ .map(WrkDetl::getWrkNo)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+ if (wrkNos.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("wrk_no", wrkNos)
+ .in("io_type", Arrays.asList(101, 108, 110))
+ .lt("wrk_sts", 14L));
+ if (wrkMasts == null || wrkMasts.isEmpty()) {
+ return Collections.emptyList();
+ }
+ wrkMasts.sort(Comparator.comparing(WrkMast::getWrkNo));
+ return wrkMasts;
+ }
+
+ private boolean needNotifyWcsStop(WrkMast wrkMast) {
+ return wrkMast != null
+ && wrkMast.getWrkSts() != null
+ && wrkMast.getWrkSts() >= 12L
+ && wrkMast.getWrkSts() < 14L;
+ }
+
+ private StopOutTaskParams buildStopOutTaskParams(OpenOrderPakoutPauseParam param, List<WrkMast> wrkMasts) {
+ StopOutTaskParams stopParams = new StopOutTaskParams();
+ stopParams.setOrderNo(param.getOrderNo());
+ stopParams.setReason(param.getReason());
+ for (WrkMast wrkMast : wrkMasts) {
+ StopOutTaskParams.TaskItem item = new StopOutTaskParams.TaskItem();
+ item.setTaskNo(String.valueOf(wrkMast.getWrkNo()));
+ if (wrkMast.getStaNo() != null) {
+ item.setStaNo(String.valueOf(wrkMast.getStaNo()));
+ }
+ item.setLocNo(wrkMast.getSourceLocNo());
+ stopParams.getTasks().add(item);
+ }
+ return stopParams;
}
@Override
@@ -838,95 +943,6 @@
@Override
@Transactional
- public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
- BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
- new EntityWrapper<BasArmMastSign>()
- .eq("order_no", param.getOrderNo())
- .eq("create_time", param.getBindingTags())
- .eq("status", 0)
- );
- if (Cools.isEmpty(basArmMastSignNew)) {
- return false;
- }
- return true;
- }
-
- @Override
- @Transactional
- public boolean TaskAgvReport(TaskAgvReportParam param) {
- BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
- if (Cools.isEmpty(basAgvMast)) {
- return false;
- }
- basAgvMast.setStatus(2);
- basAgvMastService.updateById(basAgvMast);
- return true;
- }
-
- @Override
- @Transactional
- public boolean taskAgvCreate(TaskAgvCreateParam param) {
- // 鍙傛暟妫�鏌�
- if (param == null) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
- }
- BasAgvMast basAgvMast = new BasAgvMast();
-
- Long ts = basAgvMast.getTimestamp();
- if (ts == null) {
- throw new CoolException("timestamp 鐢熸垚澶辫触");
- }
-
- String barcode = String.valueOf(ts);
- if (barcode.length() > 16) {
- barcode = barcode.substring(0, 16);
- }
- basAgvMast.setBarcode(barcode);
-
- String locNo = null;
- String staNo = null;
- basAgvMast.setTaskNo(commonService.getWorkNo(0));
- basAgvMast.setSourceStaNo(param.getSourceStaNo());
- basAgvMast.setStaNo(param.getStaNo());
- basAgvMast.setSourceLocNo(param.getSourceLocNo());
- basAgvMast.setLocNo(param.getLocNo());
- basAgvMast.setPriority(1L);
- basAgvMast.setStatus(0);
- basAgvMast.setAppeTime(new Date());
- basAgvMast.setModiTime(new Date());
- basAgvMast.setIoType(param.getIoType());
- basAgvMast.setFloorNo(param.getFloorNo());
- switch (basAgvMast.getIoType()) {
- // AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
- // AGV搴撲綅==銆婣GV搴撲綅 1
- // 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
- // 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
- case 0:
- case 1:
- locNo = param.getSourceLocNo();
- break;
- case 2:
- case 3:
- staNo = param.getSourceStaNo().toString();
- break;
- }
- basAgvMastService.insert(basAgvMast);
-
- bindCtnrAndBinParam bindParam = new bindCtnrAndBinParam();
- bindParam.setBarcode(basAgvMast.getBarcode());
- bindParam.setIndBind("1");
- bindParam.setFloorNo(basAgvMast.getFloorNo());
- bindParam.setLocNo(locNo);
- bindParam.setStaNo(staNo);
- if (bindCtnrAndBin(bindParam)) {
- return true;
- } else {
- throw new CoolException("鏈兘缁戝畾");
- }
- }
-
- @Override
- @Transactional
public List<PickWrkDetlListParam> getPickList(PdaPickListParam param) {
List<WrkDetl> wrkDetls = wrkDetlService.findByBarcode(param.getBarcode());
List<PickWrkDetlListParam> result = new ArrayList<>();
@@ -1063,95 +1079,6 @@
@Override
@Transactional
- public boolean agvApplicationPassedTheGrating(ArmAgvGratingParam arm) {
- ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡璇锋眰涓嬪彂锛�", ArmConstant.getArmUrl(arm.getArmNo()), ArmConstant.ARM_ADAPTOR_GRATING_AGVENTER, arm);
- if (result.getCode() == 200) {
- return true;
- }
- return false;
- }
-
- @Override
- @Transactional
- public boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param) {
- String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
- String AGVPath = "continueTask"; // 鎺ュ彛璺緞
- AgvGoParam agvGoParam = new AgvGoParam();
- agvGoParam.setCode("0");
- agvGoParam.setMessage("缁х画鎵ц");
- agvGoParam.setReqCode(param.getReqCode());
- agvGoParam.setTaskCode(param.getTaskCode());
- ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
- if (result.getCode() == 200) {
- return true;
- }
- return false;
- }
-
- @Override
- @Transactional
- public boolean agvBindAndBin(String taskNo) {
- String URL = "http://10.10.10.200:8181"; // AGV鎺ュ彛鍦板潃
- String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
- BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", taskNo));
- if (Cools.isEmpty(basAgvMast)) {
- return false;
- }
- if (basAgvMast.getFloorNo() == 1) {
- BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
- new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
- );
- BasAgvLocNo locNo = basAgvLocNoService.selectOne(
- new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getLocNo())
- );
- String binCode = basAgvLocNoEnd != null
- ? basAgvLocNoEnd.getAgvLocNo()
- : (locNo != null ? locNo.getAgvLocNo() : null);
- if (Cools.isEmpty(basAgvMast)) {
- return false;
- }
- String ctnrCode = basAgvMast.getBarcode().length() > 1 ? basAgvMast.getBarcode() : basAgvMast.getTimestamp().toString();
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
- agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + System.currentTimeMillis());
- agvBindCtnrAndBinParam.setCtnrCode(ctnrCode);
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- agvBindCtnrAndBinParam.setStgBinCode(binCode);
- agvBindCtnrAndBinParam.setIndBind("0");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL, AGVPath, agvBindCtnrAndBinParam);
- if (resultBind.getCode() == 200) {
- basAgvMast.setStatus(4);
- basAgvMastService.updateById(basAgvMast);
- return true;
- }
- return false;
- } else {
- if (basAgvMast != null
- && basAgvMast.getIoType() != null
- && (basAgvMast.getIoType() == 0)
- && (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
- || Objects.equals(basAgvMast.getStaNo(), 4003) || Objects.equals(basAgvMast.getSourceStaNo(), 4006))) {
- AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
- agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
- agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
- agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
- agvBindCtnrAndBinTwoParam.setIndBind("0");
- ;
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦",
- AgvConstant.AGV_URL + "/" + AgvConstant.AGV_hikRpcService, AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
- if (resultBind.getCode() != 1) {
- basAgvMast.setStatus(4);
- basAgvMastService.updateById(basAgvMast);
- return true;
- }
- }
- }
- return false;
-
- }
-
- @Override
- @Transactional
public R stationAll() {
List<StationParam> stationParams = new ArrayList<>();
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
@@ -1216,19 +1143,21 @@
Mat mat = matService.selectByMatnr(param.getMatnr());
if (Cools.isEmpty(mat)) {
- if (param.getFull()==1){
- //婊℃墭鐩�
- mat = matService.selectByMatnr("1");
- }else if (param.getFull()==0){
- //绌烘墭鐩�
- mat = matService.selectByMatnr("0");
- }
+ if (param.getFull() == 1) {
+ //婊℃墭鐩�
+ mat = matService.selectByMatnr(param.getMatnr());
+ } else if (param.getFull() == 0) {
+ //绌烘墭鐩�
+ mat = matService.selectByMatnr("emptyPallet");
+ }
}
+
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch(String.valueOf(param.getBatchId()));
waitPakin.setZpallet(param.getPalletId()); // 鎵樼洏鐮�
+
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(param.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -1240,6 +1169,7 @@
waitPakin.setOrigin(String.valueOf(param.getStorageArea()));//寤鸿鍏ュ簱鍖哄煙
waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
waitPakin.setThreeCode(param.getBizNo());
+ waitPakin.setBeBatch(param.getPackage1());//鏄惁鏁ｈ揣锛�0 闈炴暎璐э紱1 鏁ｈ揣锛涗负浜嗙鎺у嚭璐ч�熺巼锛屾暎璐у彲浠ュ嚭鎱㈢偣銆�
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -1250,7 +1180,7 @@
public R outOrder(OutTaskParam param) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
if (locMast == null) {
- return R.error("娌℃湁鎵惧埌鎵樼洏鐮�="+param.getPalletId()+"瀵瑰簲鐨勫簱浣�");
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
}
Integer ioType = 101;
// 鑾峰彇璺緞
@@ -1283,11 +1213,11 @@
wrkMast.setModiUser(9995L);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
}
List<LocDetl> locNo = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
if (locNo == null || locNo.size() == 0) {
- throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�"+locMast.getLocNo());
+ throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�" + locMast.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetl locDetl : locNo) {
@@ -1314,7 +1244,7 @@
locMast.setModiUser(9995L);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + locMast.getLocNo());
}
} else {
log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
--
Gitblit v1.9.1