From 7102e9faca7b1cc6da94be325831c13d0301d7f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 14:42:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 f31590c..c72d229 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -95,6 +95,8 @@
private ExdStockService exdStockService;
@Autowired
private ExdInstockSourceService exdInstockSourceService;
+ @Autowired
+ private Order1Service order1Service;
@Override
@@ -108,7 +110,7 @@
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ eq("zpallet", param.getBarcode())) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁缁勬墭妗ｄ腑宸插瓨鍦�");
}
@@ -130,9 +132,6 @@
//杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
Set<String> batchs = new HashSet<>();
List<String> strings = new ArrayList<>();
- long time = new Date().getTime();
- //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
- String fbillno = param.getBarcode()+"--"+time;
for (CombParam.CombMat mat : param.getCombMats()) {
if (Cools.isEmpty(mat.getBatch())) {
continue;
@@ -197,16 +196,20 @@
waitPakin.setModiUser(userId);
waitPakin.setColor(userId+"");
waitPakin.setModiTime(now);
- //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
- waitPakin.setOrigin(fbillno);
+
ExdvYanbu barcode1 = exdMaterialMapper.getBacode(detlDto.getBc());
+ //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
+ waitPakin.setOrigin(param.getBarcode()+"-"+barcode1.getIcmono()+"-"+now.getTime());
String pid="03.98";
if(!Cools.isEmpty(barcode1)&&!Cools.isEmpty(barcode1.getProdinkind())){
pid=barcode1.getProdinkind();
}
ExdStock id = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fnumber", pid));
waitPakin.setBrand(id.getFname());//浠撳簱
- waitPakin.setInspect(param.isType() ? 1 : 0);
+ if(param.isType()||Cools.isEmpty(param.getOrderNo())){
+ waitPakin.setInspect(1);
+ }
+
if (i == 1) {
// 0锛氫笉闇�瑕佽ˉ绌烘墭鐩�
// 1锛氬皬鎵樼洏
@@ -248,8 +251,10 @@
if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
+
+ Order1 order1 = order1Service.selectByNo(param.getOrderNo());
// 淇敼瀛愬崟璁㈠崟浣滀笟鏁伴噺
- if (!orderDetl1Service.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
+ if (!orderDetl1Service.increaseWorkQty2(order1.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
--
Gitblit v1.9.1