From 2c5a1382ede25186ce4b568f3b0e97c34a1ec536 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 10 三月 2026 15:04:13 +0800
Subject: [PATCH] 空托盘入库
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 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 9a0bc7f..e5b2d2c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -82,19 +82,25 @@
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ 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());
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
+// .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
+
+ if (countLoc > 0 ) {
+ throw new CoolException("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+ if (countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗ｆ潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode());
}
Date now = new Date();
@@ -118,6 +124,9 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(detlDto.getBatch())){
+ detlDto.setBatch("");
+ }
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
@@ -132,6 +141,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setBatch(mat.getBarcode()); //鎵规
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -619,4 +629,65 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ @Override
+ @Transactional
+ public void createEmptyWrk(String barcode, Long userId) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (!Cools.isEmpty(wrkMast)){
+ throw new CoolException("鎵樼洏缂栧彿" + barcode + "宸插瓨鍦ㄥ伐浣滄。");
+ }
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if (!Cools.isEmpty(waitPakins)){
+ throw new CoolException("鎵樼洏缂栧彿" + barcode + "宸茬粍鎵�");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
+ if (!locMast.getLocSts().equals("O")){
+ throw new CoolException("鎵樼洏缂栧彿" + barcode + "搴撲綅鐘舵�佷笉鏄┖搴撲綅");
+ }
+ int workNo = commonService.getWorkNo(0);
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast emptyWrkMast = new WrkMast();
+ emptyWrkMast.setWrkNo(workNo);
+ emptyWrkMast.setIoTime(new Date());
+ emptyWrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ emptyWrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細1.绌烘墭鐩樺叆搴�
+ emptyWrkMast.setIoPri(30D); // 浼樺厛绾�
+ emptyWrkMast.setCrnNo(1);
+ emptyWrkMast.setSourceStaNo(101);
+ emptyWrkMast.setStaNo(0);
+ emptyWrkMast.setLocNo(locMast.getLocNo());
+ emptyWrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ emptyWrkMast.setFullPlt("N"); // 婊℃澘锛歂
+ emptyWrkMast.setPicking("N"); // 鎷ｆ枡
+ emptyWrkMast.setExitMk("N"); // 閫�鍑�
+ emptyWrkMast.setEmptyMk("Y"); // 绌烘澘
+ emptyWrkMast.setLinkMis("Y");
+ emptyWrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ emptyWrkMast.setAppeTime(now);
+ emptyWrkMast.setModiTime(now);
+ emptyWrkMast.setModiUser(userId);
+ emptyWrkMast.setAppeUser(userId);
+ boolean res = wrkMastService.insert(emptyWrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨绌烘墭鐩樺叆搴撳伐浣滄。澶辫触");
+ }
+
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(101, true);
+ sourceStaNo.setWrkNo(emptyWrkMast.getWrkNo());
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ }
}
--
Gitblit v1.9.1