From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 280 insertions(+), 12 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 eaa2d91..f703d75 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,11 +8,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.ForwardAGVTaskDTO;
import com.zy.asrs.entity.result.HIKApiDTO;
import com.zy.asrs.entity.result.HIKResultDTO;
import com.zy.asrs.enums.*;
-import com.zy.asrs.enums.OrderSettle;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
@@ -24,8 +24,9 @@
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
-import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MesCombParam;
+import com.zy.common.model.StartupDto;
import com.zy.common.model.enums.IoWorkType;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
@@ -40,6 +41,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
/**
@@ -126,6 +128,8 @@
private BasAreasService basAreasService;
@Autowired
private StationRelaService stationRelaService;
+ @Autowired
+ private BasStationDetlService basStationDetlService;
@Override
@Transactional
@@ -1362,10 +1366,11 @@
/**
* 缂撳瓨鍑哄簱缁勬墭涓婃灦
+ *
+ * @param params
+ * @return com.core.common.R
* @author Ryan
* @date 2025/12/8 13:47
- * @param params
- * @return com.core.common.R
*/
@Override
public R combOutPub(AgvCallParams params) {
@@ -1375,10 +1380,11 @@
/**
* 缂撳瓨缁勬墭鏁版嵁
- * @author Ryan
- * @date 2025/12/8 15:37
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2025/12/8 15:37
*/
@Override
public R combCacehList(AgvCallParams params) {
@@ -1408,7 +1414,240 @@
}
/**
+ * 缂撳瓨鍖轰笂鏋剁粍鎵�
+ *
+ * @param param
+ * @param userId
+ * @author Ryan
+ * @date 2025/12/9 13:45
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cacheComb(CombParam param, Long userId) {
+ if (Objects.isNull(param.getBarcode())) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getCombMats()) || param.getCombMats().isEmpty()) {
+ throw new CoolException("缁勬墭鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode())
+ .eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+ throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ 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);
+ }
+ });
+
+ Date now = new Date();
+ 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.setType(CommonEnum.COMMON_ENUM_Y.type + "");
+ waitPakin.setIoStatus("N");
+ waitPakin.setAnfme(detlDto.getAnfme());
+ waitPakin.setThreeCode(detlDto.getThreeCode());
+ waitPakin.setStatus("Y");
+ 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ }
+
+ /**
+ * 缂撳瓨鍏ュ簱涓婃灦
+ *
+ * @param param
+ * @param userId
+ * @author Ryan
+ * @date 2025/12/9 15:05
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void combInPub(CompleteParam param, Long userId) {
+ if (Objects.isNull(param.getBarcode())) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStation())) {
+ throw new CoolException("绔欑偣涓嶈兘涓虹┖!!");
+ }
+ //TODO 淇敼缂撳瓨绔欑偣鐘舵�佸強鏁版嵁
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("barcode", param.getBarcode()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鏁版嵁閿欒,浠诲姟涓嶅瓨鍦�!!");
+ }
+ List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ if (Objects.isNull(taskDetls) || taskDetls.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒,浠诲姟鏄庣粏涓嶅瓨鍦�!!");
+ }
+
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("dev_no", task.getStaNo()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+
+ station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
+ }
+
+ if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()))) {
+ throw new CoolException("绔欑偣鍒犻櫎澶辫触!");
+ }
+
+ //浠诲姟瀹屾垚
+ task.setWrkSts(15L);
+
+ if (!taskService.updateById(task)) {
+ throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("barcodee", param.getBarcode()));
+ if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
+ }
+
+ generateCrnInTask(waitPakins, station, param.getLocType1(), userId);
+ }
+
+ /**
+ * 鐢熸垚鍫嗗灈鏈哄叆搴撲换鍔�
+ *
+ * @param station
+ * @author Ryan
+ * @date 2025/12/9 13:54
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void generateCrnInTask(List<WaitPakin> waitPakins, BasStation station, Short locType, Long userId) {
+ Date now = new Date();
+ StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
+ .eq("dev_no", station.getDevNo())
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+
+ if (Objects.isNull(rela)) {
+ throw new CoolException("鏈粦瀹氫綔涓氱珯鐐�!!");
+ }
+
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.parseInt(rela.getCrnSta()), true);
+
+ sourceStaNo.setLocType1(locType);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ WaitPakin pakin = waitPakins.stream().findFirst().get();
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(pakin);
+ StartupDto dto = commonService.getLocNo( 1, sourceStaNo.getDevNo(),findLocNoAttributeVo, locTypeDto);
+ int workNo = dto.getWorkNo();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
+ wrkMast.setStaNo(dto.getStaNo() + "");
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(pakin.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setModiUser(userId);
+ wrkMast.setAppeUser(userId);
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ 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("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+ .eq("zpallet", pakin.getBarcode());
+ WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
+ setParam.setIoStatus("Y");
+ setParam.setModiTime(now);
+ if (!waitPakinService.update(setParam, wrapper)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+
+ }
+
+ /**
* 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+ * 鍙拌溅杩囨潵榛樿鏄悓涓�绉嶇墿鏂欑被鍨�
*
* @param locCaches
* @author Ryan
@@ -1428,9 +1667,20 @@
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("area_id", basAreas.getId())
.eq("loc_id", locCaches.getId()));
- if (Objects.isNull(locDetls)) {
+ if (Objects.isNull(locDetls) || locDetls.isEmpty()) {
throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
}
+
+ Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+ List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
+ if (Objects.isNull(matList) || matList.isEmpty()) {
+ throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
+ }
+ Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ if (!longs.isEmpty() && longs.size() > 1) {
+ throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
+ }
+
//鑾峰彇绔嬪簱鍖轰俊鎭�
BasAreas one = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
if (Objects.isNull(one)) {
@@ -1450,9 +1700,9 @@
}
Collections.shuffle(devps);
BasDevp basDevp = devps.stream().findFirst().get();
-
List<LocMast> locMasts = new ArrayList<>();
Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
+ AtomicReference<Double> totalOut = new AtomicReference<>(locDetls.stream().mapToDouble(LocDetl::getAnfme).sum());
listMap.forEach((matnr, detls) -> {
//鏍规嵁supId(渚涘簲鍟�)鍒嗙被锛屽緱鍒板嚭搴撴�绘暟
Map<String, List<LocDetl>> supIds = detls.stream().collect(Collectors.groupingBy(LocDetl::getStandby1));
@@ -1488,6 +1738,7 @@
if (sum.compareTo(v) <= 0) {
//鍙斁涓�
locMasts.add(locMast);
+ totalOut.set(Math.round((totalOut.get() - sum) * 10000) / 10000.0);
}
}
});
@@ -1495,11 +1746,28 @@
});
});
- if (!locMasts.isEmpty()) {
- //鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
- generateOutTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
+ //鍒ゆ柇鏍规嵁鍒嗘嫞鍑哄簱鍚�,杩橀渶瑕佸嚭澶氬皯鎵樼洏鎴栨枡绠�;濡傛灉浣欐枡澶т簬0, 鍑烘柊鎵樼洏鎴栨枡绠�
+ if (totalOut.get().compareTo(0.0) > 0) {
+// Set<String> matnrs = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+// List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ //todo 鏍规嵁鐗╂枡绉嶇被,鍖哄垎搴撳尯绫诲瀷
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
+ .orderAsc(Arrays.asList("row1", "bay1", "lev1"))
+ .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+ locMasts.add(locMast);
+
+ //绌烘澘鍑哄簱
+ generateTask(locMasts, TaskIOType.EMPTY_OUT.type, basDevp, userId);
+
+ } else {
+ if (!locMasts.isEmpty()) {
+ //鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
+ generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
+ }
}
}
+
/**
* 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
@@ -1509,7 +1777,7 @@
* @date 2025/12/6 14:44
*/
@Transactional(rollbackFor = Exception.class)
- public void generateOutTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
+ public void generateTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
Date now = new Date();
for (LocMast locMast : locMasts) {
if (Objects.isNull(ioType)) {
--
Gitblit v1.9.1