From e0771f5cca8636156e2021bbc5db736cdeec79a6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 10:52:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 039df1b..f2dc84f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -962,8 +962,19 @@
public R manDetlOrigin(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
String jsonCode = (String) json.get("code"); //鑾峰彇鏉＄爜
String jsonOrigin = (String) json.get("origin"); //鑾峰彇鏉ユ簮鍦�
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(jsonCode)){
+ return R.error("鏉＄爜鍙傛暟涓虹┖锛�");
+ }else if (Cools.isEmpty(jsonOrigin)){
+ return R.error("鏉ユ簮鍦板弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
.eq("origin_address", jsonOrigin));
@@ -998,9 +1009,11 @@
}
//澧炲姞鎵撳嵃妗ｆ
LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
locInPrintMatService.insert(locInPrintMat);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date);
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date).eq("owner",jsonOwner);
ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
if(!Cools.isEmpty(manLocDetl1)){
BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1031,6 +1044,7 @@
manLocDetl.setModiTime(now);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
+ manLocDetl.setOwner(jsonOwner);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1045,7 +1059,13 @@
public R manDetlOrigInNo(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
+ Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
if (Cools.isEmpty(node)){
return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
@@ -1061,9 +1081,11 @@
}
//澧炲姞鎵撳嵃妗ｆ
LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
locInPrintMatService.insert(locInPrintMat);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch());
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch()).eq("owner",jsonOwner);
ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
if(!Cools.isEmpty(manLocDetl1)){
BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1092,6 +1114,7 @@
manLocDetl.setCreateTime(now);
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(now);
+ manLocDetl.setOwner(jsonOwner);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
@@ -1106,24 +1129,22 @@
@Override
public R manDetlOriginOut(JSONObject json, User user) {
- String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
- OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
+ MatPrint jsonOriginDetl = combMats.getObject(i, MatPrint.class);
+ Double parseLong = jsonOriginDetl.getAnfme();
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
if (Cools.isEmpty(manLocDetl)){
- return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonLocNo+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
+ return R.error("鏈煡璇㈠埌鍟嗗搧鏄庣粏淇℃伅!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch()+"璐т富"+jsonOriginDetl.getOwnerId());
}
- BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
- if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
+ if (manLocDetl.getAnfme() > parseLong){
BigDecimal num = anfme.subtract(outAnfme);
manLocDetl.setAnfme(num.doubleValue());
-
-
if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
return R.error("鐗╂枡淇℃伅涓嬫灦澶辫触");
}
@@ -1133,8 +1154,6 @@
return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
}
}
-
-
}
return R.ok();
}
--
Gitblit v1.9.1