From 2aa5cec3577cf0f935f074cd8283af669a07f54c Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 10:16:38 +0800
Subject: [PATCH] 出入库测试修改
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1846 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,529 insertions(+), 317 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 0e0df7e..3308d17 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,34 +1,30 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.*;
+import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
-import com.zy.common.CodeRes;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.entity.Parameter;
-import com.zy.common.model.DetlDto;
-import com.zy.common.model.MesCombParam;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.model.LocTypeDto;
+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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
+import javax.annotation.Resource;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
* Created by vincent on 2020/6/28
@@ -52,14 +48,6 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
- private PackService packService;
- @Autowired
- private OpenService openService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
private BasCrnpService basCrnpService;
@Autowired
private LocMastService locMastService;
@@ -73,148 +61,715 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
-
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
+ @Resource
+ private LocMastMapper locMastMapper;
+ @Resource
+ private DocTypeService docTypeService;
+ @Resource
+ private OrderDetlPakinService orderDetlPakinService;
+ @Resource
+ private OrderPakinService orderPakinService;
+ @Resource
+ private OrderPakoutService orderPakoutService;
+ @Resource
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private LocCacheService locCacheService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private BasStationService basStationService;
@Override
@Transactional
- public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
+ public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, Long userId) {
+ // 鍒ゆ柇搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("璇ュ簱浣嶄笉瀛樺湪");
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- 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()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ if (!locMast.getLocSts().equals("P")) {
+ return R.error("璇ュ簱浣嶇姸鎬佷负锛�" + locMast.getLocSts() + ",涓嶆弧瓒虫嫞鏂欓�斾腑骞舵澘鏉′欢锛侊紒锛�");
}
Date now = new Date();
+ // 鍒涘缓鍏ュ簱宸ヤ綔涓绘。
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(0));
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(4L); // 宸ヤ綔鐘舵�侊細鍏ュ簱瀹屾垚
+ wrkMast.setIoType(8); // 鍏ュ嚭搴撶姸鎬侊細8.鎷ｆ枡閫斾腑骞舵澘
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(1);
+ wrkMast.setSourceStaNo(1 + "");
+ wrkMast.setStaNo(1 + "");
+ wrkMast.setLocNo(param.getLocNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setAppeUser(userId);
+ wrkMast.setModiUser(userId);
+ wrkMastService.insert(wrkMast);
- // 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ for (OrderDetl orderDetl : param.getCombMats()) {
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", orderDetl.getMatnr()));
+ if (mat == null) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鐗╂枡淇℃伅涓嶅瓨鍦細" + orderDetl.getMatnr());
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setOrderNo(orderDetl.getOrderNo());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAnfme(orderDetl.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setBatch(orderDetl.getBatch());
+ if (Cools.isEmpty(orderDetl.getBatch())) {
+ wrkDetl.setBatch("");
+ }
+ wrkDetl.setBoxType1(orderDetl.getBoxType1());
+ wrkDetl.setBoxType2(orderDetl.getBoxType2());
+ wrkDetl.setBoxType3(orderDetl.getBoxType3());
+ wrkDetl.setStandby1(orderDetl.getStandby1());
+ wrkDetl.setStandby2(orderDetl.getStandby2());
+ wrkDetl.setStandby3(orderDetl.getStandby3());
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ wrkDetlService.insert(wrkDetl);
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
+ if (!Cools.isEmpty(orderDetl.getOrderNo())) {
+ OrderPakin order = orderPakinService.selectByNo(orderDetl.getOrderNo());
+ if (Cools.isEmpty(order)) {
+ continue;
}
- });
-
-
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(),
+ orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(),
+ orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(),
+ orderDetl.getBoxType3());
+ if (Cools.isEmpty(orderDetlPakin)) {
+ continue;
}
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ if (orderDetlPakin.getAnfme() < (orderDetlPakin.getWorkQty() + orderDetl.getAnfme())) {
+ throw new CoolException("骞舵澘鏁伴噺鍑洪敊,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗗苟鏉挎暟閲忎箣鍜岋紒锛侊紒");
+ }
+ // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
+ if (!orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), orderDetlPakin.getMatnr(),
+ orderDetlPakin.getBatch(), orderDetlPakin.getBrand(),
+ orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(),
+ orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(),
+ orderDetl.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
+ }
+
+ if (order.getSettle() == 1) {
+ orderPakinService.updateSettle(order.getId(), 2L, userId);
}
}
- // 鍏宠仈缁勬墭
- } else {
- Order order = orderService.selectByNo(param.getOrderNo());
- if (order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
-
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
-
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- 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() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- }
- orderService.updateSettle(order.getId(), 2L, userId);
}
+ return R.ok();
}
+ @Override
+ @Transactional
+ public R pickConfirm(PickConfirmParam param, Long userId) {
+
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", param.getLocNo()));
+ if (!locMast.getLocSts().equals("F")) {
+ return R.error("搴撲綅鐘舵�佷笉鏄湪搴�");
+ }
+
+ // 鍒ゆ柇搴撲綅鏄惁鍐荤粨
+ String sourceLocFrozen = locMastMapper.findFirstFrozenLocNo(Collections.singletonList(locMast.getLocNo()));
+ if (sourceLocFrozen != null) {
+ throw new CoolException(sourceLocFrozen + "搴撲綅宸茶鍐荤粨!");
+ }
+
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no", 104)
+ .eq("stn_no", param.getStaNo()));
+ if (staDesc == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ OrderDetlPakin orderDetlPakin = null;
+ // 妫�楠屼紶鍙傛槸鍚﹀拰璁㈠崟鏄庣粏鍖归厤
+ for (PickMatParam matParam : param.getList()) {
+ orderDetlPakin = orderDetlPakinService.selectItem(matParam.getOrderNo(), matParam.getMatnr(),
+ matParam.getBatch(), matParam.getBrand(),
+ matParam.getStandby1(), matParam.getStandby2(), matParam.getStandby3(),
+ matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3());
+ if (orderDetlPakin == null) {
+ return R.error("鐗╂枡鏁版嵁涓嶅瓨鍦�");
+ }
+
+ // 鍓╀綑鍙敤鏁伴噺
+ double count = orderDetlPakin.getAnfme() - orderDetlPakin.getWorkQty();
+ if (matParam.getCount() != count) {
+ return R.error("鐗╂枡鏁版嵁宸茶繃鏈�");
+ }
+
+ if (matParam.getUseCount() > count) {
+ return R.error("鍙敤鏁伴噺涓嶈冻");
+ }
+ }
+
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(104));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
+ wrkMast.setIoType(104); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+ wrkMast.setSourceLocNo(param.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("Y"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ wrkMast.setCrnNo(staDesc.getCrnNo());
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + param.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (PickMatParam matParam : param.getList()) {
+ Wrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.eq("status", 1);
+ wrapper.eq("matnr", matParam.getMatnr());
+ Mat mat = matService.selectOne(wrapper);
+ if (mat == null) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鐗╂枡淇℃伅涓嶅瓨鍦細" + matParam.getMatnr());
+ }
+
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setBatch(matParam.getBatch());
+ wrkDetl.setOrderNo(matParam.getOrderNo());
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAnfme(matParam.getUseCount()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ if (Cools.isEmpty(matParam.getBatch())) {
+ wrkDetl.setBatch("");
+ }
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+
+ // 鏇存柊璁㈠崟宸ヤ綔鏁伴噺
+ orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), matParam.getMatnr(),
+ matParam.getBatch(), matParam.getBrand(), matParam.getStandby1(), matParam.getStandby2(),
+ matParam.getStandby3(),
+ matParam.getBoxType1(), matParam.getBoxType2(), matParam.getBoxType3(), matParam.getUseCount());
+ // 鏇存柊宸ヤ綔妗ｇ姸鎬�
+ orderPakinService.updateSettle(orderDetlPakin.getOrderId(), 2L, userId);
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts("P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + param.getLocNo());
+ }
+ } else {
+ throw new CoolException(param.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R WarehouseOutV1(CombParam combParam, Long hostId, Long userId) {
+ // 鍒ゆ柇搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("璇ュ簱浣嶄笉瀛樺湪");
+ }
+ if (!locMast.getLocSts().equals("P")) {
+ return R.error("璇ュ簱浣嶇姸鎬佷负锛�" + locMast.getLocSts() + ",涓嶆弧瓒冲苟鏉块�斾腑鎷ｉ�夋潯浠讹紒锛侊紒");
+ }
+ // 鏌ヨ搴撳瓨鏁版嵁
+ for (CombParam.CombMat combMat : combParam.getCombMats()) {
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", combParam.getLocNo())
+ .eq("matnr", combMat.getMatnr()));
+ if (locDetlList.isEmpty()) {
+ return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
+ }
+ if (locDetlList.size() > 1) {
+ return R.error("搴撳瓨鏁版嵁澶т簬1鏉★紝涓轰繚璇佹暟鎹噯纭�э紝璇风敤姝ｅ父娴佺▼鍑哄簱锛侊紒锛�");
+ }
+ LocDetl locDetl = locDetlList.get(0);
+ if (combMat.getAnfme() > locDetl.getAnfme()) {
+ return R.error("鎷ｉ�夋暟閲忛敊璇紝瓒呭嚭搴撳瓨鏁伴噺");
+ }
+ if (!Cools.isEmpty(combMat.getOrderNo())) {
+ OrderPakout orderPakout = orderPakoutService.selectByNo(combMat.getOrderNo());
+ if (Cools.isEmpty(orderPakout)) {
+ continue;
+ }
+ if (orderPakout.getSettle() == 1) {
+ OrderInAndOutUtil.updateOrder(false, orderPakout.getId(), 2L, 9527L);
+ }
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(),
+ combMat.getMatnr(), combMat.getBatch(),
+ combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(),
+ combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
+ if (Cools.isEmpty(orderDetlPakout)) {
+ continue;
+ }
+ if (orderDetlPakout.getAnfme() < (orderDetlPakout.getWorkQty() + combMat.getAnfme())) {
+ throw new CoolException("鎷ｉ�夋暟閲忓嚭閿�,璁㈠崟鍓╀綑鍑哄簱鏁伴噺灏忎簬宸插嚭搴撴暟閲忎笌灏嗘嫞閫夋暟閲忎箣鍜岋紒锛侊紒");
+ }
+ // 淇敼璁㈠崟鏄庣粏浣滀笟鏁伴噺
+ if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), combMat.getMatnr(),
+ combMat.getBatch(), combMat.getBrand(),
+ combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(),
+ combMat.getBoxType2(), combMat.getBoxType3(), combMat.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏宸ヤ綔鏁伴噺澶辫触");
+ }
+ // // 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
+ // if (!orderDetlPakoutService.increase(orderPakout.getId(),combMat.getMatnr(),
+ // combMat.getBatch(), combMat.getBrand(),
+ // combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(),
+ // combMat.getBoxType1(), combMat.getBoxType2(),
+ // combMat.getBoxType3(),combMat.getAnfme())) {
+ // throw new CoolException("淇敼鍗曟嵁鏄庣粏瀹屾垚鏁伴噺澶辫触");
+ // }
+ // // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ // orderPakoutService.checkComplete(combMat.getOrderNo());
+ }
+ try {
+ Date now = new Date();
+ // 鍒涘缓鍏ュ簱宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(2));
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵�侊細鍑哄簱瀹屾垚
+ wrkMast.setIoType(108); // 鍏ュ嚭搴撶姸鎬侊細鍑哄簱锛屾嫞鏂欏叆搴�
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(1);
+ wrkMast.setSourceStaNo(1 + "");
+ wrkMast.setStaNo(1 + "");
+ wrkMast.setSourceLocNo(combParam.getLocNo());
+ wrkMast.setBarcode(combParam.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setAppeUser(userId);
+ wrkMast.setModiUser(userId);
+ wrkMastService.insert(wrkMast);
+
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", combMat.getMatnr()));
+ if (mat == null) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鐗╂枡淇℃伅涓嶅瓨鍦細" + combMat.getMatnr());
+ }
+
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setOrderNo(combMat.getOrderNo());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAnfme(combMat.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setBatch(combMat.getBatch());
+ if (Cools.isEmpty(combMat.getBatch())) {
+ wrkDetl.setBatch("");
+ }
+ wrkDetl.setBoxType1(combMat.getBoxType1());
+ wrkDetl.setBoxType2(combMat.getBoxType2());
+ wrkDetl.setBoxType3(combMat.getBoxType3());
+ wrkDetl.setStandby1(combMat.getStandby1());
+ wrkDetl.setStandby2(combMat.getStandby2());
+ wrkDetl.setStandby3(combMat.getStandby3());
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ wrkDetlService.insert(wrkDetl);
+ System.out.println("姝ｅ父");
+
+ } catch (Exception e) {
+ throw new CoolException("鎿嶄綔鏁版嵁寮傚父锛�" + e.getMessage());
+ }
+ }
+ return R.ok("鎿嶄綔鎴愬姛锛�");
+ }
+
+ @Override
+ public R orderOutListOrder(String barcode, Long userId) {
+ ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
+ if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 14L)
+ .eq("io_type", 104));
+ wrkMastArrayList.addAll(wrkMasts);
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 14L)
+ .eq("io_type", 107));
+ wrkMastArrayList.addAll(wrkMasts1);
+ } else {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .like("barcode", barcode)
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 104));
+ wrkMastArrayList.addAll(wrkMasts);
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .like("barcode", barcode)
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 107));
+ wrkMastArrayList.addAll(wrkMasts1);
+ }
+ return R.ok().add(wrkMastArrayList);
+ }
+
+ @Override
+ public R orderOutListOrderPick(String barcode, Long userId) {
+ ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
+ if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 103));
+ wrkMastArrayList.addAll(wrkMasts);
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 107));
+ wrkMastArrayList.addAll(wrkMasts1);
+ } else {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .like("barcode", barcode)
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 103));
+ wrkMastArrayList.addAll(wrkMasts);
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .like("barcode", barcode)
+ .eq("wrk_sts", 199L)
+ .eq("io_type", 107));
+ wrkMastArrayList.addAll(wrkMasts1);
+ }
+ return R.ok().add(wrkMastArrayList);
+ }
+
+ @Override
+ public R pickMats(String matnr, String orderNo) {
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().like("pakin", "1"));
+ ArrayList<Long> typeList = new ArrayList<>();
+ for (DocType docType : docTypes) {
+ typeList.add(docType.getDocId());
+ }
+
+ Wrapper<Order> wrapper = new EntityWrapper<>();
+ wrapper.eq("status", 1);
+ wrapper.in("doc_type", typeList);
+ List<Order> orders = orderService.selectList(wrapper);
+
+ ArrayList<Long> orderIds = new ArrayList<>();
+ for (Order order : orders) {
+ orderIds.add(order.getId());
+ }
+
+ // 鎼滅储鏄庣粏
+ Wrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
+ wrapper1.eq("status", 1);
+ wrapper1.in("order_id", orderIds);
+ wrapper1.orderBy("create_time", false);
+ if (!Cools.isEmpty(matnr)) {
+ wrapper1.like("matnr", matnr);
+ }
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper1.like("order_no", orderNo);
+ }
+ List<OrderDetl> list = orderDetlService.selectList(wrapper1);
+
+ ArrayList<PickMatParam> maps = new ArrayList<>();
+ for (OrderDetl orderDetl : list) {
+ // 鍓╀綑鍙敤鏁伴噺
+ double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ if (count <= 0) {
+ continue;
+ }
+
+ PickMatParam matParam = new PickMatParam();
+ matParam.setMatnr(orderDetl.getMatnr());
+ matParam.setBatch(orderDetl.getBatch());
+ matParam.setOrderNo(orderDetl.getOrderNo());
+ matParam.setOrderId(orderDetl.getOrderId());
+ matParam.setCount(count);
+ matParam.setUseCount(count);
+ maps.add(matParam);
+ }
+ return R.ok().add(maps);
+ }
+
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void comb(CombParam param, Long userId) {
+// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// 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) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
+//
+// if (Objects.isNull(param.getBarcode())) {
+// throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+// }
+//
+// BasContainer container = basContainerService
+// .selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+// if (Objects.isNull(container)) {
+// throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+// }
+// // if (param.getBarcode().length() != 8) {
+// // throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+// // }
+//
+// if (Objects.isNull(param.getType())) {
+// param.setType("0");
+// }
+// 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(!Objects.isNull(param.getType()), "type", param.getType())
+// .eq("zpallet", param.getBarcode()));
+// if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+// throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// }
+//
+// 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());
+// }
+// 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 {
+// // Order order = orderService.selectByNo(param.getOrderNo());
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// List<DetlDto> detlDtos = new ArrayList<>();
+// param.getCombMats().forEach(elem -> {
+// Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
+// if (Cools.isEmpty(order) || order.getSettle() > 2) {
+// throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+// }
+// // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+// // OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE,
+// // order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(),
+// // elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+// // elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
+// OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+// .eq("order_id", order.getId())
+// .eq("matnr", elem.getMatnr()));
+//
+// if (Objects.isNull(detls)) {
+// throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
+// }
+//
+// if (elem.getAnfme() > detls.getEnableQty()) {
+// throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎瑙勫垯");
+// }
+// OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),
+// elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+// DetlDto detlDto = new DetlDto(order.getOrderNo(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
+// elem.getStandby2(), elem.getStandby3(),
+// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
+// elem.getThreeCode());
+// detlDto.setOrderId(order.getId());
+// detlDto.setOrderNo(order.getOrderNo());
+// if (DetlDto.hasOrder(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// detlDtos.add(detlDto);
+// }
+// });
+//
+// Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
+// List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
+// Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
+// if (tagIds.size() > 1) {
+// throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
+// }
+//
+// // BasContainer container = basContainerService.selectOne(new
+// // EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+// // if (Objects.isNull(container)) {
+// // throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+// // }
+// // if (container.getMixMax() < detlDtos.size()) {
+// // throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() +
+// // "!!");
+// // }
+// // 杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
+// // Integer suplus = container.getMixMax();
+// for (DetlDto detlDto : detlDtos) {
+// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// // //鏈�澶氬彲鏀炬暟閲�
+// // Double singleMax = mat.getUpQty() * suplus;
+// // if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
+// // throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟缁勬墭涓婇檺涓猴細" +
+// // mat.getUpQty() + ",褰撳墠鎬婚噺瓒呭嚭鎵樼洏瑁呰浇涓婇檺!!");
+// // }
+// // BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
+// // //褰撳墠鐗╂枡闇�瑕佸崰鐢ㄦ枡绠辨牸鏁�
+// // Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
+// // suplus = suplus - curr;
+// // if (suplus < 0) {
+// // throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
+// // }
+//
+// WaitPakin waitPakin = new WaitPakin();
+// BeanUtils.copyProperties(mat, waitPakin);
+// waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
+// waitPakin.setType(param.getType());
+// waitPakin.setOrderId(detlDto.getOrderId());
+// waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+// waitPakin.setThreeCode(detlDto.getThreeCode());
+// waitPakin.setSuppCode(detlDto.getStandby1());
+// waitPakin.setStandby1(detlDto.getStandby1());
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setAppeUser(userId);
+// waitPakin.setAppeTime(now);
+// waitPakin.setModiUser(userId);
+// waitPakin.setModiTime(now);
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// }
+//
+// Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo)
+// .collect(Collectors.toSet());
+// stringSet.forEach(orderNo -> {
+// Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
+// OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+// });
+// }
+//
+// }
+
+ // 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
Date now = new Date();
// 鑾峰彇搴撲綅鍙�
- String locno = param.getLocno();
+ String locno = param.getLocNo();
Node node = nodeService.selectByUuid(locno);
if (Cools.isEmpty(node)) {
- throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�");
+ throw new CoolException(param.getLocNo() + ":搴撲綅涓嶅瓨鍦�");
}
// 鑾峰彇鍟嗗搧鍒楄〃
- for(CombParam.CombMat combMat : param.getCombMats()){
+ for (CombParam.CombMat combMat : param.getCombMats()) {
Mat mat = matService.selectByMatnr(combMat.getMatnr());
- if (Cools.isEmpty(mat)){
+ if (Cools.isEmpty(mat)) {
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
}
- if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){
+ if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme() == 0) {
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
}
- if (Cools.isEmpty(combMat.getBatch())){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+ if (Cools.isEmpty(combMat.getBatch())) {
+ // throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
manLocDetl.setNodeId(node.getId());
manLocDetl.setMaktx(mat.getMaktx());
manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(combMat.getBatch());
+ manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
if (!manLocDetlService.insert(manLocDetl)) {
@@ -222,6 +777,24 @@
}
}
}
+
+ // 鍟嗗搧涓嬫灦
+ @Override
+ public void offSale(OffSaleParam offSaleParam) {
+ ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ if (Cools.isEmpty(manLocDetl)) {
+ throw new CoolException("鏃犳鍟嗗搧锛�");
+ }
+ double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
+ if (anfme < 0) {
+ throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
+ } else if (anfme == 0) {
+ manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ }
+ manLocDetlMapper.updateAnfme0(anfme, manLocDetl.getNodeId());
+ }
+
+ // 鏌ユ壘鍟嗗搧
@Override
@Transactional
@@ -252,12 +825,15 @@
if (wrkDetl1.getAnfme() == 0) {
iterator1.remove();
}
- if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr()) && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
+ if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr())
+ && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
if (!wrkDetl.getAnfme().equals(wrkDetl1.getAnfme())) {
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
// 淇敼鏄庣粏
- if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
- throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
+ if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(),
+ wrkDetl.getBatch())) {
+ throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
}
}
iterator.remove();
@@ -270,13 +846,16 @@
for (WrkDetl wrkDetl : wrkDetls) {
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
- throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
}
// 娣诲姞鏄庣粏
for (WrkDetl wrkDetl : list) {
- if (wrkDetl.getAnfme() == 0.0D) { continue; }
+ if (wrkDetl.getAnfme() == 0.0D) {
+ continue;
+ }
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
String orderNo = wrkDetl.getOrderNo();
Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
@@ -287,12 +866,13 @@
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+ throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�"
+ + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
}
// 淇敼鐩樼偣浠诲姟涓绘。鐘舵��
- wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N");
+ wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0 ? "Y" : "N");
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
if (!wrkMastService.updateById(wrkMast)) {
@@ -301,162 +881,6 @@
}
- @Override
- @Transactional
- public void packComb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
- Date now = new Date();
-
- boolean packDown = Parameter.get().getPackDown().equals("true");
-
- // 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
- if (packDown) {
- Pack pack = packService.selectByBarcode(elem.getMatnr());
- if (pack == null) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
- }
- if (pack.getSettle() != 1) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
- }
- }
- Mat analyse = MatUtils.analyseMat(elem.getMatnr());
- // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
- DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
- if (packDown) {
- MesCombParam mesCombParam = new MesCombParam();
- mesCombParam.setZpallet(param.getBarcode());
- mesCombParam.setPakinTime(DateUtils.convert(now));
- mesCombParam.setLgort("5008");
- mesCombParam.setPlantCode("5000");
- mesCombParam.setFromCode("5012-20");
- mesCombParam.setStationCode("JJQ-PFZPDB-XX");
- for (DetlDto detlDto : detlDtos) {
- mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PACK_DOWN_URL)
- .setJson(JSON.toJSONString(mesCombParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else if (jsonObject.getInteger("code").equals(500)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException(jsonObject.getString("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- throw new CoolException(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎵撳寘涓嬬嚎甯墭涓婃姤",
- MesConstant.URL + MesConstant.PACK_DOWN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(mesCombParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
-
- }
-
- // 鐢熸垚鍏ュ簱鍗曟嵁
- String orderNo = "PACK" + snowflakeIdWorker.nextId();
- OpenOrderPakinParam openParam = new OpenOrderPakinParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(now));
- openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openService.pakinOrderCreate(openParam);
- Order order = orderService.selectByNo(orderNo);
- if (null == order) {
- throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
- }
- if (!orderService.updateSettle(order.getId(), 2L, userId)) {
- throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
- }
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- for (DetlDto detlDto : detlDtos) {
-
- // 淇敼浣滀笟鏁伴噺 ----------------------------------------
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
-
- // 淇濆瓨鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(orderNo);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- // 淇敼鎵撳寘鏁版嵁鐘舵��
- Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
- pack.setSettle(2L);
- pack.setUpdateTime(now);
- pack.setUpdateBy(userId);
- if (!packService.updateById(pack)) {
- throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
- }
- }
-
- }
- }
@Override
@Transactional
@@ -465,22 +889,27 @@
String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : "";
BasDevp sta = basDevpService.checkSiteStatus(staNo);
- //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
- if (order.getSettle() != 1 && order.getSettle() != 2){
+ // 鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
+ // Order order = orderService.selectOne(new
+ // EntityWrapper<Order>().eq("order_no", orderNo));
+ if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ // List<OrderDetl> orderDetls = orderDetlService.selectList(new
+ // EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+
Date now = new Date();
- for(OrderDetl orderDetl : orderDetls){
- //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ for (OrderDetl orderDetl : orderDetls) {
+ // 鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
- for(LocDetl locDetl : locDetls){
- //濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
+ for (LocDetl locDetl : locDetls) {
+ // 濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", locDetl.getLocNo()));
if (Cools.isEmpty(locMast)) {
@@ -488,38 +917,42 @@
}
BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
.eq("crn_no", locMast.getCrnNo()));
- if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")){
+ if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")) {
continue;
}
- //鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
+ // 鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
- if(outQty <= 0){
+ if (outQty <= 0) {
break;
}
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
Double sumCount = locDetlService.getLocDetlSumQty(locDetl.getLocNo());
- Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty; //鏈鍑哄簱閲�
+ Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty; // 鏈鍑哄簱閲�
int ioType = sumCount <= curOutQty ? 101 : 103;
stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId, now);
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
- if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
- throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
- }
+ // if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no",
+ // orderNo))){
+ // throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ // }
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 2L, userId);
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)
- .eq("matnr",orderDetl.getMatnr());
- if(!Cools.isEmpty(orderDetl.getBatch())){
+ .eq("matnr", orderDetl.getMatnr());
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
- if(!orderDetlService.update(orderDetl, wrapper)){
- throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
- }
+ // if(!orderDetlService.update(orderDetl, wrapper)){
+ // throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ // }
+ OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
+
}
}
@@ -528,7 +961,7 @@
@Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
- Double curOutQty, Integer ioType, Long userId, Date now) {
+ Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
@@ -551,8 +984,8 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
wrkMast.setSourceLocNo(locDetl.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -582,7 +1015,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(locDetl.getLocNo());
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts(ioType == 101 ? "R" : "P");
@@ -595,4 +1028,783 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ /**
+ * @author Ryan
+ * @date 2025/9/22
+ * @description: 鑾峰彇缂撳啿鍖哄簱浣嶄俊鎭�
+ * @version 1.0
+ */
+ @Override
+ public R getCacheLocs() {
+ return R.ok().add(locCacheService.selectList(new EntityWrapper<LocCache>()
+ .eq("frozen", 0)
+ .ne("full_plt", "Y")
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type).orderAsc(Arrays.asList("row1"))));
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/9/24
+ * @description: 鑾峰彇璁㈠崟鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ @Override
+ public R getMatsByQRcode(PakinMatsByQRParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrderNo())) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
+ }
+ OrderPakin orderPakin = orderPakinService
+ .selectOne(new EntityWrapper<OrderPakin>().eq("order_no", params.getOrderNo()));
+ if (Objects.isNull(orderPakin)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
+ .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())
+ .eq("order_id", orderPakin.getId()));
+ if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛� 鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ return R.ok().add(detlPakins);
+ }
+
+ /**
+ * 缂撳瓨鍏ュ簱涓婃灦
+ *
+ * @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("wrk_sts", 14L)
+// .eq("barcode", param.getCarBarcode()));
+// 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", param.getStation()));
+// if (Objects.isNull(station)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+// }
+//
+// station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+// station.setBarcode("");
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
+// }
+// basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+
+// // 浠诲姟瀹屾垚
+// task.setWrkSts(15L);
+//
+// if (!taskService.updateById(task)) {
+// throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
+// }
+
+ List<WaitPakin> waitPakins = waitPakinService
+ .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
+ }
+
+ generateCrnInTask(waitPakins, param.getStation(), param.getLocType1(), userId);
+ }
+
+ /**
+ * 鐢熸垚鍫嗗灈鏈哄叆搴撲换鍔�
+ *
+ * @param station
+ * @author Ryan
+ * @date 2025/12/9 13:54
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void generateCrnInTask(List<WaitPakin> waitPakins, String station, Short locType, Long userId) {
+ Date now = new Date();
+// StationRela rela = stationRelaService.selectOne(new EntityWrapper<StationRela>()
+// .eq("agv_sta", station.getDevNo())
+// .orderAsc(Arrays.asList("crn_sta"))
+// .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+//
+// if (Objects.isNull(rela)) {
+// throw new CoolException("鏈粦瀹氫綔涓氱珯鐐�!!");
+// }
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.parseInt(station), true);
+ sourceStaNo.setLocType1(locType);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ WaitPakin pakin = waitPakins.stream().findFirst().get();
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(pakin);
+
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", pakin.getZpallet()));
+ WrkMast wrkMast = new WrkMast();
+ if (!Objects.isNull(mast)) {
+ if (mast.getIoType().equals(110) || mast.getIoType().equals(103) || mast.getIoType().equals(107)) {
+ int ioType = mast.getIoType() - 50;
+ mast.setIoType(ioType);
+ mast.setWrkSts(2L);
+ mast.setSourceStaNo(mast.getSourceStaNo());
+ mast.setStaNo(mast.getSourceStaNo());
+ mast.setLocNo(mast.getSourceLocNo());
+ boolean res = wrkMastService.updateById(mast);
+ BeanUtils.copyProperties(mast, wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(mast.getWrkNo());
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)) {
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(mast.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(mast.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ } else {
+ throw new CoolException("鎵樼洏宸插瓨鍦ㄤ换鍔℃。锛侊紒");
+ }
+ } else {
+ StartupDto dto = commonService.getLocNo(1, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);
+ int workNo = dto.getWorkNo();
+ // 鐢熸垚宸ヤ綔妗�
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");
+ wrkMast.setStaNo(dto.getStaNo() + "");
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setBarcode(pakin.getZpallet()); // 鎵樼洏鐮�
+ 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("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ 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() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+ .eq("zpallet", pakin.getZpallet());
+ WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
+ setParam.setIoStatus("Y");
+ setParam.setModiTime(now);
+ if (!waitPakinService.update(setParam, wrapper)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ }
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ waitPakins.forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ double v = Math.round(waitPakin.getAnfme() * waitPakin.getVolume() * 100) / 100.0;
+ wrkDetl.setAnfme(v);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+ }
+
+// /**
+// * 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+// * 鍙拌溅杩囨潵榛樿鏄悓涓�绉嶇墿鏂欑被鍨�
+// *
+// * @param locCaches
+// * @author Ryan
+// * @date 2025/12/3 8:06
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public void generateCRNOutTask(BasStation station, LocCache locCaches, Long userId) {
+// if (Objects.isNull(locCaches)) {
+// throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
+// }
+// // 鑾峰彇缂撳瓨鍖轰俊鎭�
+// BasAreas basAreas = basAreasService
+// .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+// if (Objects.isNull(basAreas)) {
+// throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
+// }
+// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("area_id", basAreas.getId())
+// .eq("loc_no", locCaches.getLocNo()));
+// 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)) {
+// throw new CoolException("鏁版嵁閿欒锛氬簱鍖轰笉瀛樺湪锛侊紒");
+// }
+//
+// List<StationRela> relas = stationRelaService
+// .selectList(new EntityWrapper<StationRela>().eq("agv_sta", station.getDevNo()));
+// if (Objects.isNull(relas) || relas.isEmpty()) {
+// throw new CoolException("绔欑偣鏈叧鑱斿爢鍨涙満浣滀笟绔欑偣锛侊紒");
+// }
+//
+// Set<String> crnStas = relas.stream().map(StationRela::getCrnSta).collect(Collectors.toSet());
+//
+// List<BasDevp> devps = basDevpService.selectList(
+// new EntityWrapper<BasDevp>().in("dev_no", crnStas).eq("loading", CommonStation.COMMON_STATION_Y.type));
+// if (Objects.isNull(devps) || devps.isEmpty()) {
+// throw new CoolException("鏃犵珯鐐瑰彲鐢紒");
+// }
+// Collections.shuffle(devps);
+// BasDevp basDevp = devps.stream().findFirst().get();
+// List<CrnTaskDetlDTO> locMasts = new ArrayList<>();
+// Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
+// //鑾峰彇鏌ュ簱瀛樻�绘暟閲�
+// AtomicReference<Double> totalOut = new AtomicReference<>(0.0);
+// listMap.forEach((matnr, detls) -> {
+// Map<String, List<LocDetl>> supIds = detls.stream().collect(Collectors.groupingBy(LocDetl::getStandby1));
+// supIds.forEach((supId, sups) -> {
+// // 鏍规嵁supId(渚涘簲鍟�)鍒嗙被锛屽緱鍒伴渶瑕佸瓨鏀剧殑鎬荤┖搴撳瓨鏁伴噺
+// Double sum = sups.stream().mapToDouble(LocDetl::getAnfme).sum();
+// AtomicReference<Double> itemed = new AtomicReference<>(0.0);
+// // 鑾峰彇褰撳墠渚涘簲鍟�+ 鐗╂枡鍦ㄥ簱
+// List<LocDetl> detlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("matnr", matnr)
+// .eq("area_id", one.getId())
+// .eq("standby1", supId).orderAsc(Arrays.asList("appe_time")));
+// // TODO 鍒ゆ柇鏄惁鏈夋柊搴撲綅锛屾病鏈夋柊搴撲綅锛屽啀鎵炬湁绌烘牸鐨勪綅缃斁 1. 鍒ゆ柇褰撳墠鐗╂枡鏄惁鏈夊簱瀛� 2. 娌℃湁浣欐枡鏌ヨ鏂板簱浣�
+// if (!Objects.isNull(detlList) && !detlList.isEmpty()) {
+// Map<String, List<LocDetl>> locMaps = detlList.stream()
+// .collect(Collectors.groupingBy(LocDetl::getLocNo));
+// locMaps.forEach((locNo, adetls) -> {
+// LocMast locMast = locMastService.selectById(locNo);
+// if (Objects.isNull(locMast)) {
+// throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+// }
+// BasContainer container = basContainerService
+// .selectOne(new EntityWrapper<BasContainer>().eq("barcode", locMast.getBarcode()));
+// if (Objects.isNull(container)) {
+// throw new CoolException("鏁版嵁閿欒锛屽鍣ㄤ笉瀛樺湪锛侊紒");
+// }
+// Set<String> sets = adetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+// // 鍒ゆ柇瀹瑰櫒鏄惁杩樺彲娣锋斁,鍙婂綋鍓嶇墿鏂欏彲鏀惧灏�
+// if (container.getMixMax() > sets.size()) {
+// //浣欎笅鍙贩鏀剧绫�
+// long suplus = Math.round((container.getMixMax() - sets.size()) * 10000) / 10000;
+// Mat mats = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr));
+// if (Objects.isNull(mats)) {
+// throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+// }
+// //浣欎笅鏈�澶у彲鏀炬暟閲�
+// Double v = Math.round((mats.getUpQty() * suplus) * 10000) / 10000.0;
+// // 鍏ュ簱鏁伴噺灏忎簬闆朵笖鍏ュ簱鏁伴噺鍑忓幓宸茶鍒掑嚭鏁伴噺澶т簬闆讹紙锛�
+// if (sum.compareTo(v) <= 0 && sum.compareTo(itemed.get()) > 0) {
+// itemed.set(Math.round((itemed.get() + v) * 10000) / 10000.0);
+// // 鍙斁涓�
+// CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(adetls);
+// locMasts.add(crnTaskDetlDTO);
+// totalOut.set(Math.round((totalOut.get() + itemed.get()) * 10000) / 10000.0);
+// }
+// }
+// });
+// }
+// });
+// });
+//
+// // 鍒ゆ柇鏍规嵁鍒嗘嫞鍑哄簱鍚�,杩橀渶瑕佸嚭澶氬皯鎵樼洏鎴栨枡绠�;濡傛灉浣欐枡澶т簬0, 鍑烘柊鎵樼洏鎴栨枡绠�
+// if (totalOut.get().compareTo(0.0) > 0) {
+// generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);
+// //TODO 缁嗗寲鍖哄垎锛屽綋鍓嶅嚭搴撴墭鐩樻槸婊¤冻鎷ｈ揣鏁伴噺
+// } else {
+// 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"));
+//
+// if (Objects.isNull(locMast)) {
+// throw new CoolException("鏈煡璇㈠埌鍙敤鐨勭┖鏉夸俊鎭紒锛�");
+// }
+//
+// CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);
+// locMasts.add(crnTaskDetlDTO);
+//
+// // 绌烘澘鍑哄簱
+// generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);
+// }
+// }
+
+// /**
+// * 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
+// *
+// * @param locMasts
+// * @param station
+// * @author Ryan
+// * @date 2025/12/6 14:44
+// */
+// @Transactional(rollbackFor = Exception.class)
+// public void generateTask(List<CrnTaskDetlDTO> locMasts, Integer ioType, BasDevp devp, Long userId, BasStation station) {
+// Date now = new Date();
+//
+// for (CrnTaskDetlDTO crnTaskDetlDTO : locMasts) {
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", crnTaskDetlDTO.getLocNo()));
+// if (Objects.isNull(ioType)) {
+// continue;
+// }
+// WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
+// // 鐢熸垚宸ヤ綔鍙�
+// int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+// if (Cools.isEmpty(wrkMast1)){
+// Integer outSta = devp.getDevNo();
+// // 鑾峰彇璺緞
+// StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+//
+// // 鐢熸垚宸ヤ綔妗�
+// 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(staDesc.getCrnStn() + ""); // 婧愮珯
+// wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+// wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+// //灏忔澗椤圭洰锛岀紦瀛樺嚭搴揂GV绔欑偣锛岀敤浜庢竻绌虹紦瀛樺尯搴撳瓨
+// wrkMast.setPauseMk(station.getDevNo());
+//// wrkMast.setAvgSta(station.getDevNo());;
+// 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("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
+// }
+// }else {
+// workNo = wrkMast1.getWrkNo();
+// }
+// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+// for (LocDetl detlDto : crnTaskDetlDTO.getLocDetlList()) {
+// WrkDetl wrkDetl = new WrkDetl();
+// BeanUtils.copyProperties(detlDto, wrkDetl);
+// wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+// wrkDetl.setWrkNo(workNo);
+// wrkDetl.setIoTime(now);
+// wrkDetl.setZpallet(null);
+// wrkDetl.setBarcode(null);
+// wrkDetl.setAppeTime(now);
+// wrkDetl.setAppeUser(userId);
+// wrkDetl.setModiTime(now);
+// wrkDetl.setModiUser(userId);
+// if (!wrkDetlService.insert(wrkDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+// }
+// }
+// // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+// locMast = locMastService.selectById(locMast.getLocNo());
+// if (locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)
+// || locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
+// locMast.setLocSts(ioType == 101 ? "R" : "P");
+// locMast.setModiUser(userId);
+// locMast.setModiTime(now);
+// if (!locMastService.updateById(locMast)) {
+// throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + locMast.getLocNo());
+// }
+// } else {
+// throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+// }
+// }
+// }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/25
+ * @description: 鍛煎彨AGV鐢熸垚鍑哄簱浠诲姟
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void generateCacheOutTask(BasStation station, LocCache loc, Long userId) {
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 淇濆瓨宸ヤ綔妗�
+ Task task = new Task();
+ task.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setWrkSts(301L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setIoType(loc.getLocSts().equals("D") ? 110 : 101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setTaskType("agv")
+ .setIoPri(10D)
+ .setFullPlt(loc.getLocSts().equals("D") ? "N" : "Y") // 婊℃澘锛歒
+ .setPicking("N") // 鎷ｆ枡
+ .setExitMk("N")// 閫�鍑�
+ .setStaNo(station.getDevNo())
+ .setSourceLocNo(loc.getLocNo())
+ .setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N")// 绌烘澘
+ .setBarcode(loc.getBarcode())// 鎵樼洏鐮�
+ .setLinkMis("N")
+ .setAppeUser(userId)
+ .setAppeTime(new Date())
+ .setModiUser(userId)
+ .setModiTime(new Date());
+ if (!taskService.insert(task)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", loc.getLocNo()));
+ if (!detls.isEmpty()) {
+ List<TaskDetl> taskDetls = new ArrayList<>();
+ detls.forEach(pakin -> {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(pakin, wrkDetl);
+ wrkDetl.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setOrderNo(pakin.getOrderNo())
+ .setAnfme(pakin.getAnfme())
+ .setZpallet(pakin.getZpallet())
+ .setBatch(pakin.getBatch())
+ .setMatnr(pakin.getMatnr())
+ .setMaktx(pakin.getMaktx())
+ .setThreeCode(pakin.getThreeCode())
+ .setAppeUser(userId)
+ .setUnit(pakin.getUnit())
+ .setModel(pakin.getModel())
+ .setAppeTime(new Date())
+ .setModiUser(userId);
+ // 淇濆瓨宸ヤ綔妗ｆ槑缁�
+ if (!taskDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ });
+ }
+
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
+ loc.setModiUser(userId);
+ loc.setModiTime(new Date());
+
+ if (!locCacheService.updateById(loc)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佷俊鎭紒锛�");
+ }
+
+ // 淇敼鐩爣绔欑偣淇℃伅
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/22
+ * @description: 鐢熸垚AGV鎼繍浠诲姟
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
+ if (!tasks.isEmpty()) {
+ throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
+ }
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
+ // 淇濆瓨宸ヤ綔妗�
+ Task task = new Task();
+ task.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setWrkSts(201L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setTaskType("agv")
+ .setIoPri(10D)
+ .setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
+ .setFullPlt("Y") // 婊℃澘锛歒
+ .setPicking("N") // 鎷ｆ枡
+ .setExitMk("N")// 閫�鍑�
+ .setSourceStaNo(orgSite)
+ .setEmptyMk(loc.getLocSts().equals("D") ? "Y" : "N")// 绌烘澘
+ .setBarcode(barcode)// 鎵樼洏鐮�
+ .setLinkMis("N")
+ .setAppeUser(userId)
+ .setAppeTime(new Date())
+ .setModiUser(userId)
+ .setModiTime(new Date());
+ if (!taskService.insert(task)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ if (!type.equals("agv_back")) {
+ List<WaitPakin> pakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if (Objects.isNull(pakins) || pakins.isEmpty()) {
+ throw new CoolException("缁勬墭淇℃伅涓嶅瓨鍦紒锛�");
+ }
+
+ for (WaitPakin pakin : pakins) {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(pakin, wrkDetl);
+ wrkDetl.setId(null).setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setOrderNo(pakin.getOrderNo())
+ .setAnfme(pakin.getAnfme())
+ .setZpallet(pakin.getZpallet())
+ .setBatch(pakin.getBatch())
+ .setMatnr(pakin.getMatnr())
+ .setMaktx(pakin.getMaktx())
+ .setAppeUser(userId)
+ .setUnit(pakin.getUnit())
+ .setModel(pakin.getModel())
+ .setAppeTime(new Date())
+ .setModiUser(userId);
+ if (!taskDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+
+ }
+
+ for (WaitPakin pakin : pakins) {
+ pakin.setIoStatus("Y");
+ if (!waitPakinService.updateById(pakin)) {
+ throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ }
+ }
+ }
+
+ // 淇敼鐩爣搴撲綅鐘舵��
+ if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
+ loc.setModiTime(new Date());
+ loc.setModiUser(userId);
+ if (!locCacheService.updateById(loc)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
+ }
+
+ // 淇敼鐩爣绔欑偣淇℃伅
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type) || station.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ station.setLocSts("R"); // S.鍏ュ簱棰勭害
+ station.setBarcode(barcode);
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ }
+ }
+
+// public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO, String path) {
+// HIKResultDTO result = new HIKResultDTO();
+//
+// ForwardAGVTaskDTO forwardAGVTaskParam = new ForwardAGVTaskDTO();
+// forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+// forwardAGVTaskParam.setClientCode("IWMS");
+// forwardAGVTaskParam.setTaskTyp(haiKangApiDTO.getTaskType());
+// forwardAGVTaskParam.setCtnrTyp(haiKangApiDTO.getCtnrType());
+// forwardAGVTaskParam.setPriority(haiKangApiDTO.getPriority());
+// List<ForwardAGVTaskDTO.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+// positionCodePathsList
+// .add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getOrg(), haiKangApiDTO.getOrgType()));
+// positionCodePathsList
+// .add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getTar(), haiKangApiDTO.getTarType()));
+// forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+//
+// String body = JSON.toJSONString(forwardAGVTaskParam);
+// String response = "";
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(HIKApiConstant.AGV_IP)
+// .setPath(path)
+// .setJson(body)
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(0)) {
+// result.setSuccess(true);
+// } else {
+// result.setMessage(jsonObject.getString("message"));
+// log.error("鍙戦�乤gv浠诲姟澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", HIKApiConstant.AGV_IP + path, body, response);
+// }
+// // {"code":"1","data":"","interrupt":false,"message":"閲嶅鎻愪氦","msgErrCode":"0x3a80D012","reqCode":"fa92b49481a44627ae4d80c1400f28f6"}
+// } catch (Exception e) {
+// result.setMessage(e.getMessage());
+// log.error("鍙戦�乤gv浠诲姟寮傚父", e);
+// } finally {
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鍙戦�乤gv浠诲姟",
+// HIKApiConstant.AGV_IP + path,
+// null,
+// "127.0.0.1",
+// body,
+// response,
+// result.isSuccess());
+// } catch (Exception e) {
+// log.error("", e);
+// }
+// }
+// return result;
+// }
+
+// /**
+// * 鍛煎彨AGV绌哄彴杞﹁繑鍥�
+// * @author Ryan
+// * @date 2025/9/24
+// * @param callAgvBackParam
+// * @return com.core.common.R
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public R agvCallback(AgvCallParams callAgvBackParam, Long userId) {
+// if (Objects.isNull(callAgvBackParam.getOrgSite())) {
+// return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+// }
+//
+// // 鎸夊綋鍓嶆煡鎵惧簱浣嶉『搴忥紝鏌ュ埌涓�涓悗锛屼笉鍐嶅線涓嬫煡璇�
+// LocCache locCache = findPriorityLocCache();
+//
+// if (Objects.isNull(locCache)) {
+// return R.error("鏈煡璇㈠埌鍙敤搴撲綅");
+// }
+//
+// // 淇敼鐩爣绔欑偣淇℃伅
+// BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", callAgvBackParam.getOrgSite()));
+// if (Objects.isNull(station)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+// }
+//
+// try {
+// //绌哄彴杞﹀洖搴�
+// generateAgvTask("agv_back", locCache, callAgvBackParam.getOrgSite(), station.getBarcode(), userId);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return R.error(e.getMessage());
+// }
+//
+// return R.ok(locCache);
+// }
+
+// /**
+// * 鎸変紭鍏堢骇鏌ユ壘鍙敤搴撲綅
+// * 椤哄簭锛氬叆搴撶紦瀛樺尯 -> SO鍖� -> EO鍖�
+// */
+// private LocCache findPriorityLocCache() {
+// // 1. Try Inbound Cache Area
+// LocCache loc = findAvailableLocByAreaType(LocAreaType.LOC_AREA_TYPE_IN_CACHE);
+// if (loc != null) return loc;
+//
+// // 2. Try SO Area
+// loc = findAvailableLocByAreaType(LocAreaType.LOC_AREA_TYPE_SO);
+// if (loc != null) return loc;
+//
+// // 3. Try EO Area
+// loc = findAvailableLocByAreaType(LocAreaType.LOC_AREA_TYPE_EO);
+// return loc;
+// }
+//
+// /**
+// * 鏍规嵁鍖哄煙绫诲瀷鏌ユ壘鍙敤搴撲綅
+// */
+// private LocCache findAvailableLocByAreaType(LocAreaType areaType) {
+// BasAreas area = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", areaType.type));
+// if (area == null) {
+// return null;
+// }
+// return locCacheService.selectOne(new EntityWrapper<LocCache>()
+// .eq("area_id", area.getId())
+// .eq("frozen", 0)
+// .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+// .orderAsc(Arrays.asList("loc_no"))
+// .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
+// }
}
--
Gitblit v1.9.1