From 74863c38a407b1e0f36250dfa0c63e5da7fe5f66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:06:51 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 201 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 59c0c8f..32ba6a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.mes.TransTask;
import com.zy.asrs.entity.param.*;
+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.enums.CommonEnum;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
@@ -19,16 +24,19 @@
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
+import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
@@ -115,11 +123,192 @@
@Autowired
private BasContainerService basContainerService;
+ @Resource
+ private RcsService rcsService;
+
+
@Override
@Transactional
- public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
+ public R emptyBoxOutbound(int count, Long userId) {
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().setSqlSelect("TOP " + count + " *").eq("loc_sts", "D").eq("frozen", 0).orderBy("lev1").orderBy("bay1").orderBy("row1"));
+ if (locMastList.size() < count) {
+ return R.parse("绌烘枡绠辨暟閲忎笉瓒�(鎴栧喕缁�)锛屽墿浣欐暟閲忥細" + locMastList.size());
+ }
+ for (LocMast locMast : locMastList) {
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
+ wrkMast.setIoPri(10D);
+ wrkMast.setSourceStaNo("101"); // 婧愮珯
+ wrkMast.setStaNo("103"); // 鐩爣绔�
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ wrkMastService.insert(wrkMast);
+
+ locMast.setLocSts("R");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
+ }
+
+ }
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @Value("${wcs-slave.url}")
+ private String WCS_URL;
+
+ @Override
+ public R inboundStart(int type) {
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 103));
+// if (!basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y")) {
+// return R.parse("绔欑偣103涓嶆槸鑷姩/鏈夌墿鐘舵��");
+// }
+
+ Map<String,Object> params = new HashMap<>();
+ params.put("siteId",103);
+ int wrkNo = type == 1 ? 9998 : 9997;
+ params.put("workNo",wrkNo);
+ params.put("staNo", 104);
+ params.put("pakMk","Y");
+ String response;
+ boolean success = false;
+ String message = "";
+ try {
+ HashMap<String, Object> headers = new HashMap<>();
+ headers.put("token","1");
+ response = new HttpHandler.Builder()
+ .setUri(WCS_URL)
+ .setPath("/site/detl/update")
+// .setHeaders(headers)
+ .setParams(params)
+ .build()
+ .doPost();
+ if (Cools.isEmpty(response)) {
+ log.error("鍏ュ簱鍚姩璋冪敤wcs缁欒緭閫佺嚎涓嬪懡浠ゅけ璐ワ紝杩斿洖鍊间负绌�");
+ } else {
+ JSONObject jsonObject = JSONObject.parseObject(response);
+ if(jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ log.info("鍏ュ簱鍚姩璋冪敤wcs缁欒緭閫佺嚎涓嬪懡鎴愬姛,wrkNo:{}",wrkNo);
+ } else {
+ message = String.valueOf(jsonObject.getString("msg"));
+ log.error("鍏ュ簱鍚姩璋冪敤wcs缁欒緭閫佺嚎涓嬪懡浠ゅけ璐�:{}",message);
+ }
+ }
+ } catch (IOException e) {
+ log.error("鍏ュ簱鍚姩璋冪敤wcs缁欒緭閫佺嚎涓嬪懡浠ゅ紓甯�:{}",e.getMessage());
+ message = e.getMessage();
+ e.printStackTrace();
+ }
+
+ return success ? R.ok("涓嬪彂鎴愬姛") : R.parse(message);
+ }
+
+ @Override
+ @Transactional
+ public R djReturn(String djNo) {
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("barcode", djNo));
+ if(task == null) {
+ log.error("鍒�鏋跺彿锛歿}锛屼笉瀛樺湪浠诲姟锛�",djNo);
+ return R.parse("鍒�鏋跺彿锛�"+djNo+"涓嶅瓨鍦ㄤ换鍔�");
+ } else if(task.getWrkSts() == 305) {
+ task.setWrkSts(301L);
+ task.setModiTime(new Date());
+ task.setTaskNo(task.getTaskNo()+"-1"); // 鏇存柊浠诲姟鍙�
+ String sourceStaNo = task.getSourceStaNo();
+ task.setSourceStaNo(task.getStaNo());
+ task.setStaNo(sourceStaNo);
+
+ TransTask transTask = JSONObject.parseObject(task.getMemo(), TransTask.class);
+ transTask.setTaskno(task.getTaskNo());
+ transTask.setCurStationId(task.getSourceStaNo());
+ transTask.setNextStationId(task.getStaNo());
+ if(transTask.getTransType().equals("06")) {
+ transTask.setTransType("01");
+ } else if(transTask.getTransType().equals("02")) {
+ transTask.setTransType("05");
+ } else{
+ log.error("鍒�鏋跺彿锛歿}锛岃繍杈撶被鍨嬫湁璇細{}",djNo,transTask.getTransType());
+ return R.parse("鍒�鏋跺彿锛�"+djNo+",杩愯緭绫诲瀷鏈夎锛�" + transTask.getTransType());
+ }
+ // 鏇存柊澶囨敞
+ task.setMemo(JSONObject.toJSONString(transTask));
+
+ // 涓嬪彂缁橰CS
+ RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
+ // 妯℃澘鍚�
+ rcsTaskSubmit.setTaskType("DJ2");
+ rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
+ rcsTaskSubmit.setInitPriority(10); //榛樿10
+ List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
+ RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
+ startRoute.setSeq(0);
+ startRoute.setCode(transTask.getCurStationId());
+ startRoute.setOperation("COLLECT");
+ targetRouteList.add(startRoute);
+ RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
+ endRoute.setSeq(1);
+ endRoute.setCode(transTask.getNextStationId());
+ endRoute.setOperation("DELIVERY");
+ targetRouteList.add(endRoute);
+ rcsTaskSubmit.setTargetRoute(targetRouteList);
+
+ // 杞彂缁欐捣搴锋垨鍗庢檽RCS
+ RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
+ if (rcsReturn.getCode().equals("SUCCESS")) {
+ // 鏇存柊agv浠诲姟璁板綍
+ taskService.updateById(task);
+
+ // 鏇存柊鎺ラ┏浣嶇姸鎬�
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getSourceStaNo()));
+ if(station.getLocSts().equals("F")) {
+ station.setLocSts("R");
+ station.setModiTime(new Date());
+ basStationService.updateById(station);
+ } else {
+ log.error("agv鍥炶皟end,鎺ラ┏鐐圭姸鎬佷笉涓篎,agv浠诲姟鍙凤細{},鐘舵�侊細{}",task.getTaskNo(),task.getWrkSts());
+ }
+ } else {
+ log.error("涓嬪彂rcs鎼繍鍛戒护澶辫触锛歿}",rcsReturn);
+ return R.parse("涓嬪彂rcs澶辫触锛�" + rcsReturn.getMessage());
+ }
+
+ return R.ok("RCS鍛戒护涓嬪彂鎴愬姛!");
+ }else {
+ log.error("鍒�鏋跺彿锛歿}锛屼换鍔＄姸鎬佷笉瀵�:{}",djNo,task.getWrkSts());
+ return R.parse("鍒�鏋跺彿锛�"+djNo+",浠诲姟鐘舵�佷笉瀵癸細" + task.getWrkSts());
+ }
+ }
+
+ @Override
+ @Transactional
+ public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long userId) {
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ if(wrkMast1 == null) {
+ return R.parse("璇ユ潯鐮佷笉瀛樺湪浠诲姟锛�" + param.getBarcode());
+ } else if(wrkMast1.getIoType() != 103) {
+ return R.parse("璇ヤ换鍔″嚭搴撶被鍨嬩笉涓烘嫞鏂欏嚭搴擄細" + wrkMast1.getIoType());
+ }
//鍒ゆ柇搴撲綅鐘舵��
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
if (Cools.isEmpty(locMast)) {
return R.error("璇ュ簱浣嶄笉瀛樺湪");
}
@@ -136,9 +325,9 @@
wrkMast.setIoType(8); // 鍏ュ嚭搴撶姸鎬侊細8.鎷ｆ枡閫斾腑骞舵澘
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo(1 + "");
- wrkMast.setStaNo(1 + "");
- wrkMast.setLocNo(param.getLocNo());
+ wrkMast.setSourceStaNo(104 + "");
+ wrkMast.setStaNo(106 + "");
+ wrkMast.setLocNo(locMast.getLocNo());
wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -578,7 +767,8 @@
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",param.getBarcode()).ne("wrk_sts",15));
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
@@ -606,11 +796,12 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
- }
+// if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+// }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
+ waitPakin.setMemo("");
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode());
waitPakin.setIoStatus("N");
@@ -1374,7 +1565,7 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(11) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
.setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
--
Gitblit v1.9.1