From 4e46937e6311840fd3a146e77bca36908f2d914e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 12 一月 2026 15:39:10 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 53 +----------------------------------------------------
1 files changed, 1 insertions(+), 52 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 ad206ea..6846da3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -73,8 +73,6 @@
@Autowired
private ManLocDetlMapper manLocDetlMapper;
@Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
private AdjDetlService adjDetlService;
@@ -132,23 +130,6 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(detlDto.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(param.getBarcode())){
- throw new CoolException(detlDto.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
- }else {
- matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
- matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
- matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
- matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
- matBarcode.setModel(mat.getModel());//鍨嬪彿
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
- }
- }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setProType(detlDto.getProType());
@@ -193,23 +174,6 @@
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(orderDetl.getMatnr());
- if (mb != null){
- if (!mb.getZpallet().equals(param.getBarcode())){
- throw new CoolException(orderDetl.getMatnr() + "璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛岃鍏堣В缁�");
- }
- }else {
- matBarcode.setZpallet(param.getBarcode());//鎵樼洏鐮�
- matBarcode.setMatnr(mat.getMatnr());//鐗╂枡鍙�
- matBarcode.setMaktx(mat.getMaktx());//鐗╂枡鍚嶇О
- matBarcode.setSpecs(mat.getSpecs());//瑙勬牸
- matBarcode.setModel(mat.getModel());//鍨嬪彿
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
- }
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
@@ -711,6 +675,7 @@
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);
@@ -734,15 +699,6 @@
@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());
@@ -770,13 +726,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