From 7045b984af43d5825058b4df4b4dbc7a08cf2db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:33:53 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 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 9248666..162604f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -79,8 +79,6 @@
private DocTypeService docTypeService;
@Autowired
private MatV2Service matV2Service;
- @Autowired
- private BomMatService bomMatService;
@Override
@Transactional
@@ -292,25 +290,6 @@
waitPakin.setBrand("缁勪欢");
} else {
waitPakin.sync(mat);
- }
- // 鏍￠獙鏄惁涓篵om鍏ュ簱 bom鍏ュ簱鐨勬暟閲忎笉鑳借秴杩囧簱瀛樺師鏈夋暟閲�
- if (!Cools.isEmpty(param.getBomCode())) {
- BomMat bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", param.getBomCode()).eq("element_num", detlDto.getMatnr()));
- Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr());
- if (!Cools.isEmpty(bomQyt)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
- }
- Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr());
- if (!Cools.isEmpty(bomQty)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
- }
- if (bomMat.getZpalletAnfme() == 0.0D) {
- throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡宸插叆鏈�澶ф暟閲�");
- } else {
- if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) {
- throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡鏈�澶氬彲鍏�" + bomMat.getZpalletAnfme() + "浠�");
- }
- }
}
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
@@ -860,7 +839,7 @@
if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
- //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鍝佸彿锛屾湁鐨勮瘽鐩存帴澧炲姞鏁伴噺
ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
if (checkManLocDetl == null) {
ManLocDetl manLocDetl = new ManLocDetl();
@@ -934,7 +913,7 @@
if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getWorkQty())) {
return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍙嚭鏁伴噺");
}
- //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鍝佸彿
ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch());
if (checkManLocDetl == null) {
return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
--
Gitblit v1.9.1