From beb2ef6184aa6eeef9e9605e7625dec6638d30b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 十一月 2023 16:16:27 +0800
Subject: [PATCH] #平库下架
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 80 ++++++++++++++++++++++++++++++---------
src/main/java/com/zy/asrs/controller/MobileController.java | 11 +++++
src/main/java/com/zy/asrs/service/MobileService.java | 2 +
3 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d264284..2b9c273 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -386,7 +386,7 @@
}
@RequestMapping("/manDetl/in/origin")
- @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
public R manDetlin(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
@@ -394,5 +394,14 @@
return mobileService.manDetlOrigin(json,getUser());
}
+ @RequestMapping("/manDetl/out/origin")
+ @ManagerAuth(memo = "骞冲簱涓嬫灦")
+ public R manDetlout(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOriginOut(json,getUser());
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index a41d694..49e6642 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -50,4 +50,6 @@
R adjustNew(MobileAdjustNewParam combParam, Long userId);
R manDetlOrigin(JSONObject json, User user);
+
+ R manDetlOriginOut(JSONObject json, User user);
}
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 26928ec..bb73f24 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -984,31 +984,73 @@
if (Cools.isEmpty(node)){
return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
}
- Date now = new Date();
- ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
- manLocDetl.setLocNo(node.getName());
- manLocDetl.setNodeId(node.getId());
-// manLocDetl.setZpallet(waitPakin.getZpallet());
- manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
- manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
- manLocDetl.setMaktx(code);
- manLocDetl.setWeight(Double.valueOf( weight));
- manLocDetl.setUnit(date);
- manLocDetl.setStatus(1);
- manLocDetl.setCreateBy(user.getId());
- manLocDetl.setCreateTime(now);
- manLocDetl.setUpdateBy(user.getId());
- manLocDetl.setModiTime(now);
- // manLocDetl.setOrderNo(waitPakin.getOrderNo());
- manLocDetl.setStockFreeze(1);
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
+ ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
+ if(!Cools.isEmpty(manLocDetl1)){
+ BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl1.getAnfme());
- if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
- return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ 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.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
+ manLocDetl.setMaktx(code);
+ manLocDetl.setWeight(Double.valueOf( weight));
+ manLocDetl.setUnit(date);
+ 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++) {
+ DetlOriginDTO jsonOriginDetl = combMats.getObject(i, DetlOriginDTO.class);
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+ BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
+
+ if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
+ BigDecimal num = anfme.subtract(outAnfme);
+ manLocDetl.setAnfme(num.doubleValue());
+ if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅涓嬫灦澶辫触");
+ }
+ }else if (manLocDetl.getAnfme().equals(jsonOriginDetl.getAnfme())) {
+ if (!manLocDetlService.delete(manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
+ }
+ }
}
--
Gitblit v1.9.1