From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index e407211..3c19a34 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wms.asrs.entity.param.StockOutParam;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.Order;
@@ -24,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@RestController
@@ -107,9 +109,10 @@
MergePreviewDto dto = new MergePreviewDto();
dtos.add(dto);
- double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();
+ double anfme = Math.round((waveDetl.getAnfme() - waveDetl.getWorkQty()) * 1000) / 1000.0;
dto.setMatnr(waveDetl.getMatnr());
dto.setBatch(waveDetl.getBatch());
+ dto.setStatus(0);
dto.setWorkQty(0.0);
dto.setAnfme(anfme);
dto.setOrderIds(orderIds);
@@ -122,13 +125,23 @@
}
@PostMapping("/out/orderOut/merge/wave")
- @OperationLog("娉㈡鍚堝苟璁㈠崟鍑哄簱")
+ @OperationLog("鐢熸垚娉㈡浠诲姟")
@Transactional
public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
outManage.orderOutMergeWave(param);
return R.ok();
}
+ @PostMapping("/out/locs/stock")
+ @OperationLog("鎵嬪姩鍑哄簱")
+ public R stockOut(@RequestBody StockOutParam param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ outManage.outLocStock(param);
+ return R.ok();
+ }
+
@PostMapping("/out/wave/generate")
@OperationLog("鐢熸垚娉㈡")
@Transactional
--
Gitblit v1.9.1