From 3b41d1fa6a657f4785ac03aab864da45b9ef274f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 九月 2023 15:06:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 41 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 a7b95e6..9eeae39 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -206,8 +206,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
- detlDto.setPayment(orderDetl.getPayment());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -531,25 +530,30 @@
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
- if (node.getParentName().equals("A") || node.getParentName().equals("B")){
- if (node.getRow1() == 1 && locDetls.size() >=11){
- return R.error("璇ュ簱浣嶆帓宸叉弧");
- }
- if (node.getRow1() == 6 && locDetls.size() >=4){
- return R.error("璇ュ簱浣嶆帓宸叉弧");
- }
- if (node.getRow1() == 12 && locDetls.size() >=4){
- return R.error("璇ュ簱浣嶆帓宸叉弧");
- }
-
- }
- if (locDetls.size() >=12){
- return R.error("璇ュ簱浣嶆帓宸叉弧");
- }
+// if (node.getParentName().equals("A") || node.getParentName().equals("B")){
+// if (node.getRow1() == 1 && locDetls.size() >=11){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 6 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 12 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+//
+// }
+// if (locDetls.size() >=12){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
@@ -578,8 +582,8 @@
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
-// ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
-// if (checkManLocDetl == null) {
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (checkManLocDetl == null) {
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
@@ -594,27 +598,28 @@
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
+ manLocDetl.setStockFreeze(1);
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
-// }
-// else {
-// if (checkManLocDetl.getWeight() == null){
-// checkManLocDetl.setWeight(0.0);
-// }
-// if (jsonOrderDetl.getWeight() == null){
-// jsonOrderDetl.setWeight(0.0);
-// }
-// if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
-// node.getName(),
-// jsonOrderDetl.getMatnr(),
-// jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
-// )<=0
-// ){
-// return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
-// }
-//
-// }
+ }
+ else {
+ if (checkManLocDetl.getWeight() == null){
+ checkManLocDetl.setWeight(0.0);
+ }
+ if (jsonOrderDetl.getWeight() == null){
+ jsonOrderDetl.setWeight(0.0);
+ }
+ if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
+ node.getName(),
+ jsonOrderDetl.getMatnr(),
+ jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
+ )<=0
+ ){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+
+ }
orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
orderDetl.setUpdateTime(date);
@@ -649,6 +654,12 @@
public R manDetlOut(JSONObject json,User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
JSONArray combMats = json.getJSONArray("combMats");
@@ -783,6 +794,11 @@
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
if (Cools.isEmpty(waitPakins)){
return R.error("鏈煡璇㈠埌缁勬墭");
@@ -827,8 +843,7 @@
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(date);
manLocDetl.setOrderNo(waitPakin.getOrderNo());
- manLocDetl.setOwner(waitPakin.getOwner());
- manLocDetl.setPayment(waitPakin.getPayment());
+ manLocDetl.setStockFreeze(1);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -852,8 +867,6 @@
waitPakinLog.setModiTime(date);
waitPakinLog.setAppeUser(user.getId());
waitPakinLog.setAppeTime(date);
- waitPakinLog.setOwner(waitPakin.getOwner());
- waitPakinLog.setPayment(waitPakin.getPayment());
waitPakinLog.setUuid(waitPakin.getUuid());
if (!waitPakinLogService.insert(waitPakinLog)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
--
Gitblit v1.9.1