From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 94b07ff..ce6ac8d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,15 +12,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.LocDetlMapper;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.ManLocDetlService;
-import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +31,8 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private AdjDetlService adjDetlService;
@Autowired
private LocDetlMapper locDetlMapper;
@@ -86,6 +82,9 @@
param.put("endTime", DateUtils.convert(dates[1]));
param.remove("modi_time");
}
+ }
+ if(!Cools.isEmpty(param.get("select"))){
+ param.put("brand", param.get("select"));
}
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
@@ -162,12 +161,12 @@
return R.ok();
}
@RequestMapping(value = "/locDetl/updateBatch/auth")
- @ManagerAuth(memo = "鍚堝悓鍙凤紙鎵瑰彿锛変慨鏀�")
+ @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("鍓嶅悗鍚堝悓鍙蜂竴鑷达紝鏃犻渶淇敼锛侊紒锛�");
+ return R.error("鍓嶅悗鎵瑰彿涓�鑷达紝鏃犻渶淇敼锛侊紒锛�");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")){
@@ -186,6 +185,13 @@
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()));
+ }
+ AdjDetl adjDetlSource = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getBatch(),null,locDetlSource.getAnfme(),null,null,locDetlSource.getAnfme()-locDetl.getAnfme(),null,"淇敼鎵瑰彿:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
+ AdjDetl adjDetlEnd=null;
+ if (Cools.isEmpty(locDetlEnd)){
+ adjDetlEnd = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getSku(),null,0.0,null,null,locDetl.getAnfme(),null,"淇敼鎵瑰彿:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
+ }else {
+ adjDetlEnd = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getSku(),null,locDetlEnd.getAnfme(),null,null,locDetlEnd.getAnfme()+locDetl.getAnfme(),null,"淇敼鎵瑰彿:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
}
if (locDetlSource.getAnfme()-locDetl.getAnfme()==0){
if (Cools.isEmpty(locDetlEnd)){
@@ -219,10 +225,12 @@
}else {
return R.error("杈撳叆鏁伴噺鏈夎锛岃瑙勮寖鎿嶄綔锛侊紒锛�");
}
+ adjDetlService.insert(adjDetlSource);
+ adjDetlService.insert(adjDetlEnd);
}catch (Exception e){
- return R.error("寮傚父");
+ return R.error("寮傚父锛侊紒锛佽瑙勮寖鎿嶄綔锛侊紒锛�");
}
- return new R(201,"鍚堝悓鍙蜂慨鏀规垚鍔燂紝璇峰埛鏂伴〉闈紒锛侊紒");
+ return new R(201,"鎵瑰彿淇敼鎴愬姛锛岃鍒锋柊椤甸潰锛侊紒锛�");
}
@RequestMapping(value = "/locDetl/delete/auth")
--
Gitblit v1.9.1