From cb7339c12d6cd3f4d1668d27d34dbb4b515cc6c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:50:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 09ccf77..bee7db5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -87,13 +87,18 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getBarcode())){
- throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
- }
+// if (Cools.isEmpty(param.getBarcode())){
+// throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+ try{
+ param.setOrderNo(param.getCombMats().get(0).getOrderNo());
+ }catch (Exception e){
+
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -130,6 +135,7 @@
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ one.setOwner(detlDto.getOwner());
} else {
detlDtos.add(detlDto);
}
@@ -153,7 +159,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setOwner(param.getOwner());
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -193,7 +199,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -220,7 +226,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setOwner(param.getOwner());
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -264,7 +270,7 @@
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
manLocDetl.setUuid(uuid);
- manLocDetl.setOwner(param.getOwner());
+ manLocDetl.setOwner(1);
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
}
@@ -510,7 +516,6 @@
@Override
public R manDetlIn(JSONObject json) {
Date date = new Date();
- int jsonOwner= (int) json.get("owner");
String jsonLocNo = (String) json.get("locNo");
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
@@ -553,7 +558,7 @@
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
manLocDetl.setUuid(uuid);
- manLocDetl.setOwner(jsonOwner);
+ manLocDetl.setOwner(orderDetl.getOwner());
if(!manLocDetlService.insert(manLocDetl)){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
@@ -608,7 +613,7 @@
if (Cools.isEmpty(node, order)) {
return R.error("鍙傛暟涓虹┖");
}
- OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),"");
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
}
--
Gitblit v1.9.1