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/OutController.java | 92 ++++++++++++++++++++++++++++++----------------
1 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 330c001..21af89e 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -5,15 +5,14 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OutlocDetlParam;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import com.zy.third.entity.ExdOutstockSource;
+import com.zy.third.service.ExdOutstockSourceService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -45,6 +44,10 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private ExdOutstockSourceService exdOutstockSourceService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -135,37 +138,25 @@
for (TaskDto taskDto : taskDtos) {
workService.stockOut(null, taskDto, getUser(), taskDto.getStaNo());
}
- return R.ok();
- }
-
-
- @PostMapping("/out/pakout2/preview/auth")
- @ManagerAuth
- public R pakoutPreview2(@RequestBody List<Long> ids) {
- if (Cools.isEmpty(ids)) {
- return R.parse(BaseRes.PARAM);
+ //瀵瑰嚭搴撹鍗曟祦姘村彿杩涜鏇存柊
+ Order order = orderService.selectByNo(locDtos.get(0).getOrderNo());
+ if(order.getDocType()==81){
+ order.setAccountDay(Cools.isEmpty(order.getAccountDay()) ? 1 : order.getAccountDay()+1);
+ order.setUpdateTime(new Date());
+ orderService.updateById(order);
}
- List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
- List<LocDto> locDtos = new ArrayList<>();
- Set<String> exist = new HashSet<>();
-
- for (OrderDetl orderDetl : orderDetls) {
-
- List<LocDetl> locDetls = locDetlService.queryStockAll(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
- for (LocDetl locDetl : locDetls) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), locDetl.getAnfme());
- List<String> staNos = new ArrayList<>();
- staNos.add("C1");
- staNos.add("C2");
- staNos.add("C3");
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
+ //瀵瑰嚭搴撳崟杩涜閿佸畾
+ List<ExdOutstockSource> fBillNo = exdOutstockSourceService.selectList(new EntityWrapper<ExdOutstockSource>().eq("FBillNo", order.getOrderNo()));
+ if(fBillNo != null){
+ for(ExdOutstockSource exdOutstockSource : fBillNo){
+ exdOutstockSource.setStatus(10);
+ exdOutstockSourceService.updateById(exdOutstockSource);
}
- orderDetl.setUpdateBy(getUserId());
+
}
- return R.ok().add(locDtos);
+
+ return R.ok();
}
@Synchronized
@@ -220,8 +211,45 @@
orderService.updateById(order);
}
+ //瀵瑰嚭搴撳崟杩涜閿佸畾
+ List<ExdOutstockSource> fBillNo = exdOutstockSourceService.selectList(new EntityWrapper<ExdOutstockSource>().eq("FBillNo", order.getOrderNo()));
+ if(fBillNo != null){
+ for(ExdOutstockSource exdOutstockSource : fBillNo){
+ exdOutstockSource.setStatus(10);
+ exdOutstockSourceService.updateById(exdOutstockSource);
+ }
+ }
return R.ok();
+ }
+
+ @PostMapping("/out/pakout2/preview/auth")
+ @ManagerAuth
+ public R pakoutPreview2(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
+ for (OrderDetl orderDetl : orderDetls) {
+
+ List<LocDetl> locDetls = locDetlService.queryStockAll(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ for (LocDetl locDetl : locDetls) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), locDetl.getAnfme());
+ List<String> staNos = new ArrayList<>();
+ staNos.add("C1");
+ staNos.add("C2");
+ staNos.add("C3");
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ }
+ orderDetl.setUpdateBy(getUserId());
+ }
+ return R.ok().add(locDtos);
}
@PostMapping("/out/pakout/preview/auth1")
@@ -253,7 +281,7 @@
issued = issued - locDetl.getAnfme();
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto("搴撳瓨涓嶈冻", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
--
Gitblit v1.9.1