From 67826a2c51bbc013db409dd1a5e29dd4ba52fd72 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 20 一月 2026 09:27:47 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 140 ++++++++++++++++++++++++++++------------------
1 files changed, 85 insertions(+), 55 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 59f0af9..25a3c13 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;
@@ -72,8 +73,6 @@
@Autowired
private ManLocDetlMapper manLocDetlMapper;
@Autowired
- private MatBarcodeService matBarcodeService;
- @Autowired
private AdjDetlService adjDetlService;
@@ -83,9 +82,6 @@
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) {
@@ -95,10 +91,6 @@
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()));
@@ -129,19 +121,7 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(detlDto.getMatnr());
- if (mb != null && !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());//鍨嬪彿
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�---->" + detlDto.getMatnr());
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
@@ -160,9 +140,6 @@
waitPakin.setMemo(detlDto.getMemo());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
}
}
// 鍏宠仈缁勬墭
@@ -191,18 +168,6 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- //鏍￠獙褰撳墠鐗╂枡涓庢墭鐩樼粦瀹氫俊鎭槸鍚︽纭�
- MatBarcode matBarcode = new MatBarcode();
- MatBarcode mb = matBarcodeService.selectbyMatnr(orderDetl.getMatnr());
- if (mb != null && !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());//鍨嬪彿
- }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
@@ -224,9 +189,6 @@
waitPakin.setPacking(orderDetl.getPacking());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- if (!matBarcodeService.insert(matBarcode)) {
- throw new CoolException("鐗╂枡涓庢墭鐩樼粦瀹氬け璐�");
}
});
@@ -673,21 +635,27 @@
@Override
@Transactional
- public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
+ public void adjustNew(CombParam param, Boolean re, Long userId) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏃犳湁鏁堝伐浣滄。");
}
-
-
+ if (wrkMast.getWrkSts() != 14){
+ throw new CoolException("骞舵澘鏃犳晥锛屽伐浣滄。" + wrkMast.getWrkNo() + "鏈畬鎴愭垨宸插叆搴�");
+ }
+ if (wrkMast.getIoType() != 104) {
+ throw new CoolException("宸ヤ綔妗�:" + wrkMast.getWrkNo() + " 涓嶆槸骞舵澘绫诲瀷");
+ }
List<CombParam.CombMat> combMats = param.getCombMats();
- String recordRecordLog = "鎵樼洏鐮�" + param.getBarcode() + "鐩樼偣璁板綍锛�";
+ String recordRecordLog = "鎵樼洏鐮�" + param.getBarcode() + "骞舵澘璁板綍锛�";
AdjDetl adjDetl = new AdjDetl();
adjDetl.setAppeTime(new Date());
adjDetl.setAppeUser(userId);
adjDetl.setModiTime(new Date());
adjDetl.setModiUser(userId);
- adjDetl.setLocNo(wrkMast.getSourceLocNo());
+ adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
+ adjDetl.setBarcode( param.getBarcode()); // 鎵樼洏鐮�
+ adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //骞舵澘瀵瑰簲鐨勫伐浣滃彿
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -699,29 +667,91 @@
adjDetl.setMatnr(wrkDetl.getMatnr());
adjDetl.setBatch(wrkDetl.getBatch());
- adjDetl.setAdjQty(wrkDetl.getAnfme());
+ adjDetl.setAdjQty(wrkDetl.getAnfme()); //鍙樻洿鏁伴噺
if (Cools.isEmpty(wrkDetlOld)) {
WrkDetl detl = new WrkDetl();
detl.sync(wrkDetl);
detl.setWrkNo(wrkMast.getWrkNo());
detl.setZpallet(wrkMast.getBarcode());
- wrkDetlService.insert(detl);
+ detl.setIoTime(wrkMast.getIoTime()); //骞舵澘鏂板鐨勭墿鏂欎繚鎸佸師鏈夌墿鏂欑殑鏃堕棿
+ detl.setWeight(0.0); // 閲嶉噺 鍚庨潰濡傛灉闇�瑕� 鍐嶄慨鏀�
+ detl.setModiUser(userId); // 淇敼浜哄憳
+ detl.setAppeUser(userId); // 娣诲姞浜哄憳
+ wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
- adjDetl.setOriQty(0.0);
+ adjDetl.setOriQty(0.0); // 鍘熸暟閲�
adjDetlService.insert(adjDetl);
- } else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
- wrkDetlService.updateAnfme(wrkDetl.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());
+ }
+// else if (wrkDetlOld.getAnfme() != wrkDetl.getAnfme()) {
+// 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);
+//
+// }
+// else if (wrkDetlOld.getAnfme() == wrkDetl.getAnfme()) {
+// recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
+// continue;
+// }
+ else {
+// throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏈煡寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ 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);
+ }
+ }
+ log.info(recordRecordLog);
+ }
- } else if (wrkDetlOld.getAnfme() == wrkDetl.getAnfme()) {
+ @Override
+ public void inventory(CombParam combParam, Boolean aTrue, Long userId) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(combParam.getBarcode());
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("鎵樼洏鐮�:" + combParam.getBarcode() + " 鏃犳湁鏁堝伐浣滄。");
+ }
+ if (wrkMast.getWrkSts() != 14) {
+ throw new CoolException("鐩樼偣鏃犳晥锛屽伐浣滄。" + wrkMast.getWrkNo() + "鏈畬鎴愭垨宸插叆搴�");
+ }
+ if (wrkMast.getIoType() != 107) {
+ throw new CoolException("宸ヤ綔妗�:" + wrkMast.getWrkNo() + " 涓嶆槸鐩樼偣绫诲瀷");
+ }
+
+ List<CombParam.CombMat> combMats = combParam.getCombMats();
+ String recordRecordLog = "鎵樼洏鐮�" + combParam.getBarcode() + "鐩樼偣璁板綍锛�";
+
+ for (CombParam.CombMat wrkDetl : combMats) {
+ WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", wrkMast.getWrkNo())
+ .eq("matnr", wrkDetl.getMatnr())
+// .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
+ );
+
+ if (Cools.isEmpty(wrkDetlOld)) {
+ WrkDetl detl = new WrkDetl();
+ detl.sync(wrkDetl);
+ detl.setWrkNo(wrkMast.getWrkNo());
+ detl.setZpallet(wrkMast.getBarcode());
+ detl.setIoTime(wrkMast.getIoTime()); //鐩樼偣鏂板鐨勭墿鏂欎繚鎸佸師鏈夌墿鏂欑殑鏃堕棿
+ detl.setWeight(0.0); // 閲嶉噺 鍚庨潰濡傛灉闇�瑕� 鍐嶄慨鏀�
+ detl.setModiUser(userId); // 淇敼浜哄憳
+ detl.setAppeUser(userId); // 娣诲姞浜哄憳
+ wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
+ recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
+ }
+
+ // 鏇存柊鏁伴噺
+ else if (!wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
+ wrkDetlService.updateInventoryAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏇存柊鏁伴噺锛�" + wrkDetl.getAnfme();
+ }
+
+ // 鏁伴噺淇濇寔涓嶅彉
+ else if (wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
continue;
- } else {
- throw new CoolException("鎵樼洏鐮�:" + param.getBarcode() + " 鏈煡寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
}
log.info(recordRecordLog);
--
Gitblit v1.9.1