From 98350a9179bfbeaf48bcda07666b8fb7c49fdfa8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 九月 2023 12:50:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 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 d99f017..2cc459f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -9,10 +9,7 @@
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;
-import com.zy.asrs.entity.param.OffSaleParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -82,6 +79,9 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WaitPakinLogService waitPakinLogService;
+
+ @Autowired
+ private LocCheckService locCheckService;
@@ -530,6 +530,11 @@
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
@@ -593,6 +598,7 @@
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
+ manLocDetl.setStockFreeze(1);
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
@@ -648,6 +654,12 @@
public R manDetlOut(JSONObject json,User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
JSONArray combMats = json.getJSONArray("combMats");
@@ -782,6 +794,11 @@
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
if (Cools.isEmpty(waitPakins)){
return R.error("鏈煡璇㈠埌缁勬墭");
@@ -826,8 +843,7 @@
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(date);
manLocDetl.setOrderNo(waitPakin.getOrderNo());
- manLocDetl.setOwner(waitPakin.getOwner());
- manLocDetl.setPayment(waitPakin.getPayment());
+ manLocDetl.setStockFreeze(1);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -851,8 +867,6 @@
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)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
@@ -879,4 +893,51 @@
}
return R.ok("涓婃灦鎴愬姛");
}
+
+ @Override
+ public R adjustNew(MobileAdjustNewParam combParam, Long userId) {
+
+
+ for (WrkDetl detl: combParam.getWrkDetls()){
+ EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no", combParam.getOrderNo())
+ .eq("matnr", detl.getMatnr())
+ .eq("loc_no", detl.getLocNo());
+ LocCheck CheckDetl = locCheckService.selectOne(wrapper);
+ if (CheckDetl == null){
+ Date now = new Date();
+ LocCheck locCheck = new LocCheck();
+ locCheck.setLocNo(detl.getLocNo());
+ locCheck.setMaktx(detl.getMaktx());
+ locCheck.setType(1);
+ locCheck.setMatnr(detl.getMatnr());
+ locCheck.setAnfme(detl.getAnfme());
+ locCheck.setRealAnfme(detl.getAnfme());
+ locCheck.setDiffAnfme(detl.getAnfme());
+ locCheck.setExamine(0);
+ locCheck.setOwner(detl.getOwner());
+ locCheck.setPayment(detl.getPayment());
+ locCheck.setCreateTime(now);
+ locCheck.setUpdateTime(now);
+ locCheck.setOrderNo(combParam.getOrderNo());
+
+ if (!locCheckService.insert(locCheck)){
+ return R.error("鐩樼偣鏄庣粏鎻掑叆澶辫触");
+ }
+ }else {
+ CheckDetl.setRealAnfme(detl.getAnfme());
+ CheckDetl.setDiffAnfme(detl.getAnfme()- CheckDetl.getAnfme());
+ if (!locCheckService.update(CheckDetl,wrapper)){
+ return R.error("鏄庣粏鏇存柊澶辫触");
+ }
+
+
+
+ }
+
+
+ }
+
+ return R.ok("鐩樼偣鎴愬姛");
+ }
}
--
Gitblit v1.9.1