From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
index b4cc123..f8f15ea 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -26,6 +26,7 @@
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
+import zy.cloud.wms.manager.utils.AddZero;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
@@ -123,18 +124,14 @@
for (Long id : ids) {
Order target = orderService.selectOne(new EntityWrapper<Order>()
.eq("id", id));
- if (target.getSettle() != 0 || target.getSettle() != 1) {
+ if (target.getSettle() == 0 || target.getSettle() == 1) {
+ orderService.deleteById(id);
+ orderDetlService.delete(new EntityWrapper<OrderDetl>()
+ .eq("order_id",id));
+ }else {
throw new CoolException("浠呭厑璁稿垹闄�'鍒濆鍖�','寰呭鐞�'鐘舵�佺殑璁㈠崟");
}
- }
- if (Cools.isEmpty((Object) ids)){
- return R.error();
- }
- for (Long id : ids){
- if (!orderService.deleteById(id)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
}
return R.ok();
}
@@ -208,12 +205,12 @@
@ManagerAuth
public R createWave(@RequestBody List<Order> orders){
/**
- * 鎺х
+ * 鎺х涓庡垵濮嬪寲
*/
Integer seqNo = 1;
for (Order order : orders) {
- if (order.getSettle() != 2L) {
- return R.error("浠呮敮鎸�'鏈嫞璐�'鐘舵�佺敓鎴愭尝娆�");
+ if (order.getSettle() != 1L) {
+ return R.error("浠呮敮鎸�'寰呭鐞�'鐘舵�佺敓鎴愭尝娆�");
}
}
@@ -226,8 +223,20 @@
wave.setHostId(getHostId());
String s = UUID.randomUUID().toString().replace("-","");
wave.setUuid(s);
- String waveNo = "WAVE-" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
- wave.setWaveNo(waveNo);
+ String waveNo = "WAVE-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
+ String currNum = waveService.getCurrNum(waveNo);
+ if (!Cools.isEmpty(currNum)) {
+ String[] split = currNum.split("-");
+ if (split.length < 2){
+ wave.setWaveNo(waveNo + "0001");
+ }
+ Integer newNum = Integer.parseInt(split[2]) +1;
+ String format = AddZero.addZeroForNum(newNum + "", 4);
+ wave.setWaveNo(waveNo + format);
+ }else {
+ wave.setWaveNo(waveNo + "0001");
+ }
+
wave.setOrdersQty(orders.size());
wave.setStatus((short) 0);
wave.setCreateBy(getUserId());
@@ -271,6 +280,15 @@
.eq("id",checkWaveDetl.getId()));
}
}
+
+ /**
+ * 鎺х,鍑鸿繃BUG,鍙敓鎴愯〃澶�,涓嶇敓鎴愯〃韬�
+ */
+ if (Cools.isEmpty(allOrderDetls)) {
+ waveService.delete(new EntityWrapper<Wave>()
+ .eq("id",wave.getId()));
+ throw new CoolException("鎵句笉鍒板嚭搴撳崟缁嗚妭,璇疯仈绯荤鐞嗗憳");
+ }
/**
* 鍙嶅啓鍑哄簱鍗曡〃澶�
*/
--
Gitblit v1.9.1