From 21fdb6d630bd74e262e0c5d40f9478cc844eb556 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 24 九月 2025 15:31:24 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 6cf5d08..47d2487 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -78,7 +78,7 @@
@Override
@Transactional
- public void comb(CombParam param, Long userId) {
+ public void comb(CombParam param,Long userId,String fxId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -161,6 +161,7 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
waitPakin.setBrand(param.getCk());//浠撳簱
+ waitPakin.setInspect(param.isType()?1:0);
if(i==1){
// 0锛氫笉闇�瑕佽ˉ绌烘墭鐩�
// 1锛氬皬鎵樼洏
@@ -199,7 +200,7 @@
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(),fxId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
--
Gitblit v1.9.1