From 5ee8d702138b67a8070e850ba622aa4b07d64fb9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 30 十月 2025 13:00:08 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 af100de..5025977 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -11,6 +11,7 @@
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.PickInParam;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
@@ -702,7 +703,7 @@
adjDetl.setMatnr(wrkDetl.getMatnr());
- adjDetl.setBatch(wrkDetl.getBatch());
+// adjDetl.setBatch(wrkDetl.getBatch());
adjDetl.setAdjQty(wrkDetl.getAnfme());
if (Cools.isEmpty(wrkDetlOld)) {
@@ -710,13 +711,14 @@
detl.sync(wrkDetl);
detl.setWrkNo(wrkMast.getWrkNo());
detl.setZpallet(wrkMast.getBarcode());
+ detl.setIoTime(new Date());
wrkDetlService.insert(detl);
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
adjDetl.setOriQty(0.0);
adjDetlService.insert(adjDetl);
} else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
- wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ wrkDetlService.updateAnfme(wrkDetl.getAnfme() + wrkDetlOld.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏂版暟閲忥細" + wrkDetl.getAnfme();
adjDetl.setOriQty(wrkDetlOld.getAnfme());
adjDetlService.insert(adjDetl);
@@ -733,19 +735,14 @@
@Override
public void combToWms(WaitPakin waitPakin) {
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
-// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-// eq("zpallet", waitPakin.getBarcode()).eq("io_status", "N")) > 0) {
-// throw new CoolException(waitPakin.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
-// }
-
if (waitPakin.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", waitPakin.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", waitPakin.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(waitPakin.getBarcode());
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
+ if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + waitPakin.getBarcode());
}
@@ -768,13 +765,6 @@
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(dto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode mb = matBarcodeService.selectbyMatnr(dto.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(waitPakin.getBarcode())){
- throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
--
Gitblit v1.9.1