From 1e71bc58ffd44e9bfe2f15f0d227a2abf38caa48 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:22:44 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 243 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 189 insertions(+), 54 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 eb258b4..2943288 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.HIKApiConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -25,6 +26,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -86,6 +88,9 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+
+ @Autowired
+ private SlaveProperties slaveProperties;
@Autowired
private AdjDetlService adjDetlService;
@@ -584,12 +589,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// throw new CoolException(BaseRes.PARAM);
+// }
+ if (Objects.isNull(param.getBarcode())) {
throw new CoolException(BaseRes.PARAM);
}
- if (param.getCombMats().size() < 1) {
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())
.eq("io_status", "N")) > 0) {
@@ -621,51 +627,68 @@
Date now = new Date();
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
- elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
- elem.getThreeCode());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.findDto(detlDtos, detlDto);
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
- }
+ if (param.getPakinType().equals("3")) {
WaitPakin waitPakin = new WaitPakin();
- BeanUtils.copyProperties(mat, waitPakin);
- waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode());
waitPakin.setIoStatus("N");
- waitPakin.setAnfme(detlDto.getAnfme());
- waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setStatus("Y");
- waitPakin.setSuppCode(detlDto.getStandby1());
- waitPakin.setStandby1(detlDto.getStandby1());
- waitPakin.setStandby2(detlDto.getStandby2());
- waitPakin.setStandby3(detlDto.getStandby3());
- waitPakin.setBoxType1(detlDto.getBoxType1());
- waitPakin.setBoxType2(detlDto.getBoxType2());
- waitPakin.setBoxType3(detlDto.getBoxType3());
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ } else {
+ if (param.getCombMats().size() < 1) {
+ throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+ }
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+ elem.getStandby2(), elem.getStandby3(),
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
+ elem.getThreeCode());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+ throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ BeanUtils.copyProperties(mat, waitPakin);
+ waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakin.setIoStatus("N");
+ waitPakin.setAnfme(detlDto.getAnfme());
+ waitPakin.setThreeCode(detlDto.getThreeCode());
+ waitPakin.setStatus("Y");
+ waitPakin.setSuppCode(detlDto.getStandby1());
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setBoxType1(detlDto.getBoxType1());
+ waitPakin.setBoxType2(detlDto.getBoxType2());
+ waitPakin.setBoxType3(detlDto.getBoxType3());
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
}
}
// 鍏宠仈缁勬墭
@@ -1316,6 +1339,7 @@
throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
}
List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
+ .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())
.eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
.eq("order_id", orderPakin.getId()));
if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
@@ -1768,12 +1792,23 @@
throw new CoolException("绔欑偣涓嶈兘涓虹┖!!");
}
if (Objects.isNull(param.getLocType1())) {
- param.setLocType1((short)1);
+ param.setLocType1((short) 1);
}
+ BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+ if (Objects.isNull(container)) {
+ throw new CoolException("瀹瑰櫒缂栫爜鏈淮鎶わ紝璇风淮鎶ゅ悗鍐嶆搷浣滐紒锛�");
+ }
- log.info("WCS浠诲姟鐢熸垚璇锋眰鍙傛暟锛�", JSONObject.toJSONString(param));
+ Integer whsType = 1;
+ //鐢ㄤ簬鍒ゆ柇鏂欑鎵樼洏锛屾枡绠憋紝绗兼
+ if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+ whsType = 3;
+ } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+ whsType = 2;
+ }
+ log.info("WCS浠诲姟鐢熸垚璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(param));
BasDevp station = basDevpService.selectOne(new EntityWrapper<BasDevp>()
.eq("dev_no", param.getSourceStaNo()));
@@ -1783,13 +1818,13 @@
List<WaitPakin> waitPakins = waitPakinService
.selectList(new EntityWrapper<WaitPakin>()
- .eq("io_status" , "N")
+ .eq("io_status", "N")
.eq("zpallet", param.getBarcode()));
if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
}
- WrkMast wrkMast = generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
+ WrkMast wrkMast = generateCrnInTask(waitPakins,whsType, station, param.getLocType1(), userId);
Map<String, Object> response = new HashMap<>();
response.put("taskNo", wrkMast.getWrkNo());
@@ -1932,12 +1967,13 @@
/**
* 鐢熸垚鍫嗗灈鏈哄叆搴撲换鍔�
*
+ * @param whsType
* @param station
* @author Ryan
* @date 2025/12/9 13:54
*/
@Transactional(rollbackFor = Exception.class)
- public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, BasDevp station, Short locType, Long userId) {
+ public WrkMast generateCrnInTask(List<WaitPakin> waitPakins, Integer whsType, BasDevp station, Short locType, Long userId) {
Date now = new Date();
// StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
// .eq("agv_sta", station.getDevNo())
@@ -1993,7 +2029,7 @@
}
} else {
- StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), whsType, findLocNoAttributeVo, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -2003,7 +2039,7 @@
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
- wrkMast.setStaNo(dto.getStaNo() + "");
+ wrkMast.setStaNo(!Objects.isNull(dto.getStaNo()) ? dto.getStaNo() + "" : null);
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setBarcode(pakin.getZpallet()); // 鎵樼洏鐮�
@@ -2044,14 +2080,21 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(waitPakin);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ if (!Objects.isNull(waitPakin.getMatnr())) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ } else {
+ wrkMast.setWrkSts(1L);
+ wrkMast.setIoType(10);
+
+ wrkMastService.updateById(wrkMast);
}
});
@@ -2580,6 +2623,7 @@
/**
* 绉诲簱浠诲姟鐢宠
+ *
* @param combParam
* @param userId
* @return
@@ -2642,6 +2686,97 @@
}
/**
+ * 6.15WCS鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
+ * @param combParam
+ * @param l
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R changeLoc(CompleteParam combParam, long l) {
+ if (Objects.isNull(combParam)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ if (Objects.isNull(combParam.getLocNo())) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�!!");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
+ if (Objects.isNull(locMast)) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦ㄦ垨搴撲綅鐘舵�侀潪 F.鍦ㄥ簱 鐘舵��");
+ }
+
+ List<Integer> doubleLocs = slaveProperties.getDoubleLocs();
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .in("row1", doubleLocs)
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
+ Map<String, Object> result = new HashMap<>();
+ LocMast selected = new LocMast();
+ for (LocMast loc : locMasts) {
+ LocMast temLoc = locMastService.selectById(loc.getLocNo());
+ if (Objects.isNull(temLoc)) {
+ throw new CoolException("鏁版嵁閿欒锛� 鍘熷簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, temLoc.getLocNo());
+
+ LocMast locMast1 = locMastService.selectById(shallowLoc);
+ if (Objects.isNull(locMast1)) {
+ throw new CoolException("鏁版嵁閿欒锛� 鏂板簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+ if (!locMast1.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ continue;
+ }
+ selected = loc;
+
+ break;
+ }
+
+ WrkMast moveTask = generateMoveTask(selected, locMast);
+ result.put("locNo", selected.getLocNo());
+ result.put("taskNo", moveTask.getWrkNo());
+
+ return R.ok().add(result);
+
+ }
+
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ *
+ * @param result
+ * @param sourceLoc
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public WrkMast generateMoveTask(LocMast result, LocMast sourceLoc) {
+ WrkMast wrkMast = new WrkMast();
+ int workNo = commonService.getWorkNo(0);
+
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setLocNo(result.getLocNo());
+ wrkMast.setSourceLocNo(sourceLoc.getLocNo());
+ wrkMast.setWrkSts(11L);
+ wrkMast.setIoType(11);
+ wrkMast.setCrnNo(sourceLoc.getCrnNo());
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ wrkMast.setIoPri(13D);
+ wrkMast.setWrkDate(new Date());
+
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc.getLocNo()));
+ locDetls.forEach(detl -> {
+ detl.setLocNo(result.getLocNo());
+ if (!locDetlService.updateById(detl)) {
+ throw new CoolException("鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ });
+
+ return wrkMast;
+ }
+
+ /**
* 鎸変紭鍏堢骇鏌ユ壘鍙敤搴撲綅
* 椤哄簭锛氬叆搴撶紦瀛樺尯 -> SO鍖� -> EO鍖�
*/
--
Gitblit v1.9.1