From 3a41e569efa225c4285d2b2b0e0b7035a6324d9e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 30 六月 2023 11:14:56 +0800
Subject: [PATCH] yt初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 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 04b7a00..ee26e48 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -81,6 +82,9 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+
@Override
@@ -645,7 +649,7 @@
manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //鑾峰彇鎷ｈ揣鍗曚腑鐨勫搴旂殑璁㈠崟
if(manPakOut.getCount() == null){
- manPakOut.setCount(0);
+ manPakOut.setCount(0.0);
}
// if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曠殑鏁伴噺
// return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曟�绘暟閲�");
@@ -663,6 +667,12 @@
}
if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
+ }
+ if(checkManLocDetl.getWeight() == null){
+ checkManLocDetl.setWeight(0.0);
+ }
+ if(jsonOrderDetl.getWeight() == null){
+ jsonOrderDetl.setWeight(0.0);
}
Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
@@ -700,7 +710,7 @@
return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
if(manPakOut.getCount() == null){
- manPakOut.setCount(0);
+ manPakOut.setCount(0.0);
}
manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
@@ -732,4 +742,81 @@
}
return R.ok("涓嬫灦瀹屾垚");
}
+
+ @Override
+ public R manDetlInBarcode(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
+ if (waitPakin.equals(null)){
+ return R.error("鏈煡璇㈠埌缁勬墭");
+ } else if (waitPakin.getIoStatus() == "Y") {
+ return R.error("缁勬墭宸茬粡鐢熸垚宸ヤ綔妗�");
+ }
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo())); //鑾峰彇瀵瑰簲璁㈠崟淇℃伅
+ if (order.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟淇℃伅");
+ }
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.
+ getOrderNo()).eq("matnr", waitPakin.getMatnr())); //鑾峰彇瀵瑰簲璁㈠崟鏄庣粏淇℃伅
+ if (orderDetl.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟鏄庣粏淇℃伅");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (node.equals(null)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ Date date = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(waitPakin.getAnfme());
+ manLocDetl.setMatnr(waitPakin.getMatnr());
+ manLocDetl.setMaktx(waitPakin.getMaktx());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(date);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(date);
+ manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setOwner(waitPakin.getOwner());
+ manLocDetl.setPayment(waitPakin.getPayment());
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ orderDetl.setQty(orderDetl.getQty()+ waitPakin.getAnfme()); //鏇存柊璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.updateById(orderDetl)){
+ return R.error("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
+
+ WaitPakinLog waitPakinLog = new WaitPakinLog(); //鍒濆鍖栧叆搴撻�氱煡鍗曟棩蹇楀疄浣撶被
+ waitPakinLog.setZpallet(waitPakin.getZpallet());
+ waitPakinLog.setAnfme(waitPakin.getAnfme());
+ waitPakinLog.setMatnr(waitPakin.getMatnr());
+ waitPakinLog.setLocNo(waitPakin.getLocNo());
+ waitPakinLog.setMaktx(waitPakin.getMaktx());
+ waitPakinLog.setOrderNo(waitPakin.getOrderNo());
+ waitPakinLog.setWeight(waitPakin.getWeight());
+ waitPakinLog.setStatus("Y");
+ waitPakinLog.setIoStatus("Y");
+ waitPakinLog.setModiUser(user.getId());
+ 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)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
+ return R.error("鎻掑叆鍘嗗彶鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){ //鍒犻櫎鍘熷叆搴撻�氱煡妗�
+ return R.error("鍒犻櫎鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ return R.ok("涓婃灦鎴愬姛");
+ }
}
--
Gitblit v1.9.1