From 10b0dccb27336e2f286b5b464d035ead6dee7de9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 12:57:20 +0800
Subject: [PATCH] #库龄分品号、批次、货主
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 2c7e32a..f2dc84f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -89,6 +89,9 @@
@Autowired
private OriginRuleService originRuleService;
+ @Autowired
+ private LocInPrintMatService locInPrintMatService;
+
@Override
@@ -957,9 +960,21 @@
@Override
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));
@@ -992,8 +1007,13 @@
if (Cools.isEmpty(mat)){
return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
}
+ //澧炲姞鎵撳嵃妗ｆ
+ 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());
@@ -1006,7 +1026,6 @@
}
}else {
- Date now = new Date();
ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
manLocDetl.sync(mat);
manLocDetl.setLocNo(node.getUuid());
@@ -1025,6 +1044,7 @@
manLocDetl.setModiTime(now);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
+ manLocDetl.setOwner(jsonOwner);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1037,8 +1057,15 @@
@Override
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("鏈煡璇㈠埌搴撲綅淇℃伅");
@@ -1052,8 +1079,13 @@
if (Cools.isEmpty(mat)){
return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
}
+ //澧炲姞鎵撳嵃妗ｆ
+ 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());
@@ -1066,7 +1098,6 @@
}
}else {
- Date now = new Date();
ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
manLocDetl.sync(mat);
manLocDetl.setLocNo(node.getUuid());
@@ -1083,6 +1114,7 @@
manLocDetl.setCreateTime(now);
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(now);
+ manLocDetl.setOwner(jsonOwner);
// manLocDetl.setOrderNo(waitPakin.getOrderNo());
manLocDetl.setStockFreeze(1);
@@ -1097,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("鐗╂枡淇℃伅涓嬫灦澶辫触");
}
@@ -1124,8 +1154,6 @@
return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
}
}
-
-
}
return R.ok();
}
--
Gitblit v1.9.1