From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 187 insertions(+), 50 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 e37ebd6..8a8822b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,18 +7,16 @@
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.OffSaleParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
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.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -26,10 +24,8 @@
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.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -51,6 +47,9 @@
private BasDevpService basDevpService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
@@ -82,30 +81,30 @@
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ String barcode = param.getBarcode();
+ if (Cools.isEmpty(barcode, param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if(param.getCombMats().size()>1){
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+// if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null || obj.getAnfme() == 0)){
+// throw new CoolException("璇锋鏌ュ叆搴撶墿鏂欐暟閲�");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
-
- if(param.getBarcode().length()!=8){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
- }
- if (param.getCombMats().size()>1){
- 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 (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",barcode));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + barcode);
+ }
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
}
Date now = new Date();
@@ -114,30 +113,35 @@
if (Cools.isEmpty(param.getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
- 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);
- }
- });
+// List<DetlDto> detlDtos = new ArrayList<>();
+// param.getCombMats().forEach(elem -> {
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+// detlDto.setModel(elem.getModel());
+// detlDto.setSpecs(elem.getSpecs());
+// detlDto.setManuDate(elem.getManuDate());
+// 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() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ for (CombParam.CombMat combMat: param.getCombMats()) {
+ String batch = combMat.getBatch();
+ int countL = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("batch", batch));
+ int countW = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ int countP = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("batch", batch));
+ if (countL > 0 || countW > 0 || countP > 0) {
+ throw new CoolException("璇ユ壒鍙峰凡缁忓瓨鍦�===>>" + batch);
}
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.sync(combMat);
+ waitPakin.setBarcode(barcode);
+ waitPakin.setZpallet(barcode); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setAnfme(1.0); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
@@ -147,6 +151,27 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
+//
+// 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.setBatch(detlDto.getBatch());
+// waitPakin.setZpallet(barcode); // 鎵樼洏鐮�
+// 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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// }
// 鍏宠仈缁勬墭
} else {
Order order = orderService.selectByNo(param.getOrderNo());
@@ -185,7 +210,7 @@
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setZpallet(barcode); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -630,4 +655,116 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ @Resource
+ private WorkService workService;
+
+ @Override
+ public R pdaOutbound(JSONObject param,long userId) {
+ int sta = (int) param.get("sta");
+ List<Map<String,Object>> combMats = (List<Map<String,Object>>) param.get("combMats");
+ if (sta == 0 || combMats.isEmpty()) {
+ throw new CoolException("鍙傛暟寮傚父锛�");
+ }
+
+ StockOutParam stockOutParam = new StockOutParam();
+ stockOutParam.setOutSite(sta);
+ List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ for (Map locDetl :combMats) {
+ StockOutParam.LocDetl detl = new StockOutParam.LocDetl();
+ detl.setMatnr((String) locDetl.get("matnr"));
+ detl.setBatch((String) locDetl.get("batch"));
+ detl.setLocNo((String) locDetl.get("locNo"));
+ detl.setCount(1.0);
+ locDetls.add(detl);
+ }
+
+ stockOutParam.setLocDetls(locDetls);
+ workService.startupFullTakeStore(stockOutParam, userId);
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @Override
+ public R manualCallEmptyTray(int stnNo, Long userId) {
+ // 浜哄伐pda鍛煎彨绌烘墭鐩�
+ // 0.鍒ゆ柇鏄惁宸插瓨鍦ㄨ鐩爣绔欑偣鐨勭┖鎵樼洏鍑哄簱浠诲姟锛屾湁鍒欑洿鎺ヨ繑鍥烇紙鐘舵�佷笉涓�15锛屾垨鑰呬负15浣嗘槸浠诲姟鍙疯繕鍦ㄨ緭閫佺嚎涓婏級
+ List<WrkMast> wrkMasts = wrkMastMapper.queryEmptyOutLocWork(stnNo);
+ if (!wrkMasts.isEmpty()) {
+ throw new CoolException("宸插瓨鍦ㄨ绔欑偣绌烘墭鐩樺嚭搴撲换鍔★細" + stnNo);
+ }
+
+ //1.鏍规嵁鍑哄簱绔欑偣鍘诲鎵剧┖鎵樼洏搴撲綅锛屽厛鎵炬祬搴撲綅
+ List<LocMast> locMasts = new ArrayList<>();
+ EntityWrapper<LocMast> entityWrapper = new EntityWrapper<>();
+ entityWrapper.eq("loc_sts","D").orderAsc(Arrays.asList("row1","lev1","bay1"));
+ if (stnNo == 100) {
+ entityWrapper.in("row1",2,3);
+ locMasts = locMastService.selectList(entityWrapper);
+ if (locMasts.isEmpty()) {
+ entityWrapper.in("row1",1,4);
+ locMasts = locMastService.selectList(entityWrapper);
+ }
+ } else if(stnNo == 102) {
+ entityWrapper.in("row1",6,7);
+ locMasts = locMastService.selectList(entityWrapper);
+ if (locMasts.isEmpty()) {
+ entityWrapper.in("row1",5,8);
+ locMasts = locMastService.selectList(entityWrapper);
+ }
+ }
+ if (locMasts.isEmpty()) {
+ throw new CoolException("娌℃湁鎵惧埌绌烘墭鐩橈紝绔欑偣锛�" + stnNo);
+ }
+
+ // 鍙栫涓�涓┖搴撲綅
+ LocMast locMast = locMasts.get(0);
+
+ // 1.1.鑾峰彇宸ヤ綔璺緞
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 110).eq("stn_no",
+ stnNo).eq("crn_no", locMast.getCrnNo()));
+ if (staDesc == null) {
+ throw new CoolException("璺緞涓嶅瓨鍦�");
+ }
+ Integer sourceStaNo = staDesc.getCrnStn();
+ if (Cools.isEmpty(sourceStaNo)) {
+ throw new CoolException("妫�绱㈡簮绔欏け璐�");
+ }
+
+ //2.鐢熸垚绌烘墭鐩樺嚭搴撳伐浣滄。
+ Date now = new Date();
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(WorkNoType.PAKOUT.type));
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
+ wrkMast.setIoPri(10D);
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ // 3.鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
+ if (locMast.getLocSts().equals("D")) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
+ }
+ }
+
+ return R.ok("绌烘墭鐩樺嚭搴撴垚鍔�");
+ }
}
--
Gitblit v1.9.1