From 827cf8651cbb734beff52c8bff4dc44a4519436c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 十二月 2023 16:59:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 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 4de430c..2c7e32a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -993,7 +993,7 @@
return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
}
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date);
ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
if(!Cools.isEmpty(manLocDetl1)){
BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1009,7 +1009,7 @@
Date now = new Date();
ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
manLocDetl.sync(mat);
- manLocDetl.setLocNo(node.getName());
+ manLocDetl.setLocNo(node.getUuid());
manLocDetl.setNodeId(node.getId());
// manLocDetl.setZpallet(waitPakin.getZpallet());
manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
@@ -1036,14 +1036,77 @@
}
@Override
+ public R manDetlOrigInNo(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (Cools.isEmpty(node)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
+
+ Mat mat = matService.selectByMatnr(jsonOriginDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
+ }
+
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch());
+ ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
+ if(!Cools.isEmpty(manLocDetl1)){
+ BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl1.getAnfme());
+
+ BigDecimal sum = anfme.add(inAnfme);
+ manLocDetl1.setAnfme(sum.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅涓婃灦澶辫触");
+ }
+
+ }else {
+ Date now = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.sync(mat);
+ manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setName("");
+ manLocDetl.setModel("");
+ manLocDetl.setWeight(jsonOriginDetl.getAnfme());
+ manLocDetl.setBatch(jsonOriginDetl.getBatch());
+ manLocDetl.setCustName(jsonOriginDetl.getOrigin());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ // manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ }
+
+ }
+ return R.ok();
+ }
+
+ @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());
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+ if (Cools.isEmpty(manLocDetl)){
+ return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonLocNo+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
+ }
BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
--
Gitblit v1.9.1