From 97673b8cf60ee8514758b3ba764a860f14c49fa1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 05 十二月 2022 09:21:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 2f91219..718a63b 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,11 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -83,7 +86,7 @@
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
- @RequestMapping(value = "/locDetl/list/auth")
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -113,6 +116,7 @@
// }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -153,6 +157,55 @@
locDetlService.updateById(locDetl);
return R.ok();
}
+ @RequestMapping(value = "/locDetl/updateBatch/auth")
+ @ManagerAuth(memo = "鍚堝悓鍙凤紙鎵瑰彿锛変慨鏀�")
+ public R updateBatch(LocDetl locDetl){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ return R.error("鍙傛暟寮傚父");
+ }else if (locDetl.getBatch().equals(locDetl.getSku())){
+ return R.error("鍓嶅悗鍚堝悓鍙蜂竴鑷达紝鏃犻渶淇敼锛侊紒锛�");
+ }
+ try{
+ LocDetl locDetlSource = locDetlService.selectItem(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch());
+ if (Cools.isEmpty(locDetlSource) || (locDetl.getBatch()==null && locDetlSource.getBatch()!=null)){
+ locDetlSource = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch()));
+ if (Cools.isEmpty(locDetlSource)){
+ return R.error("寮傚父");
+ }
+ }
+ LocDetl locDetlEnd = locDetlService.selectItem(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getSku());
+ if (!Cools.isEmpty(locDetlEnd) && locDetl.getSku()==null && locDetlEnd.getBatch()!=null){
+ locDetlEnd = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getSku()));
+ }
+ if (locDetlSource.getAnfme()-locDetl.getAnfme()==0){
+ if (Cools.isEmpty(locDetlEnd)){
+ locDetlSource.setBatch(locDetl.getSku());
+ locDetlService.update(locDetlSource,new EntityWrapper<LocDetl>()
+ .eq("loc_no",locDetlSource.getLocNo()).eq("matnr",locDetlSource.getMatnr()).eq("batch",locDetl.getBatch()));
+ }else {
+ locDetlService.updateAnfme(locDetlEnd.getAnfme()+locDetl.getAnfme(),locDetlEnd.getLocNo(),locDetlEnd.getMatnr(),locDetlEnd.getBatch());
+ locDetlService.delete(new EntityWrapper<LocDetl>()
+ .eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch()));
+ }
+ }else if (locDetlSource.getAnfme()>locDetl.getAnfme()){
+ locDetlService.updateAnfme(locDetlSource.getAnfme()-locDetl.getAnfme(),locDetlSource.getLocNo(),locDetlSource.getMatnr(),locDetlSource.getBatch());
+ if (Cools.isEmpty(locDetlEnd)){
+ locDetlSource.setAnfme(locDetl.getAnfme());
+ locDetlSource.setBatch(locDetl.getSku());
+ locDetlService.insert(locDetlSource);
+ }else {
+ locDetlService.updateAnfme(locDetlEnd.getAnfme()+locDetl.getAnfme(),locDetlEnd.getLocNo(),locDetlEnd.getMatnr(),locDetlEnd.getBatch());
+ }
+ }else {
+ return R.error("杈撳叆鏁伴噺鏈夎锛岃瑙勮寖鎿嶄綔锛侊紒锛�");
+ }
+ }catch (Exception e){
+ return R.error("寮傚父");
+ }
+ return new R(201,"鍚堝悓鍙蜂慨鏀规垚鍔燂紝璇峰埛鏂伴〉闈紒锛侊紒");
+ }
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
--
Gitblit v1.9.1