From c945a29f5be6b38dd5fb0b398abf3ca3e937dd56 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 19 三月 2022 09:39:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 65907ce..b4cc123 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -117,6 +117,17 @@
@ManagerAuth
@Transactional
public R deleteBatch(@RequestParam(value = "ids[]") Long[] ids){
+ /***
+ * 鎺х
+ */
+ for (Long id : ids) {
+ Order target = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("id", id));
+ if (target.getSettle() != 0 || target.getSettle() != 1) {
+ throw new CoolException("浠呭厑璁稿垹闄�'鍒濆鍖�','寰呭鐞�'鐘舵�佺殑璁㈠崟");
+ }
+
+ }
if (Cools.isEmpty((Object) ids)){
return R.error();
}
@@ -206,6 +217,7 @@
}
}
+
/**
* 鐢熸垚娉㈡琛ㄥご
*/
@@ -214,7 +226,7 @@
wave.setHostId(getHostId());
String s = UUID.randomUUID().toString().replace("-","");
wave.setUuid(s);
- String waveNo = "wave-" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ String waveNo = "WAVE-" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
wave.setWaveNo(waveNo);
wave.setOrdersQty(orders.size());
wave.setStatus((short) 0);
@@ -228,6 +240,7 @@
List<OrderDetl> allOrderDetls = orderDetlService.selectBatchByOrderNo(orders);
for (OrderDetl allOrderDetl : allOrderDetls) {
WaveDetl checkWaveDetl = waveDetlService.selectOne(new EntityWrapper<WaveDetl>()
+ .eq("wave_id",wave.getId())
.eq("matnr", allOrderDetl.getMatnr())
.eq("batch", allOrderDetl.getBatch()));
if (Cools.isEmpty(checkWaveDetl)) {
@@ -242,6 +255,9 @@
waveDetl.setAnfme(allOrderDetl.getAnfme());
waveDetl.setMatnr(allOrderDetl.getMatnr());
waveDetl.setMaktx(allOrderDetl.getMaktx());
+ waveDetl.setSpecs(allOrderDetl.getSpecs());
+ waveDetl.setModel(allOrderDetl.getModel());
+ waveDetl.setUnit(allOrderDetl.getUnit());
waveDetl.setStatus(0);
waveDetl.setBatch(allOrderDetl.getBatch());
waveDetl.setCreateBy(getUserId());
@@ -249,14 +265,22 @@
waveDetlService.insert(waveDetl);
}else {
checkWaveDetl.setOrderQty(checkWaveDetl.getOrderQty()+1);
- checkWaveDetl.setOrderNos(checkWaveDetl.getOrderNos() + "-split-" +allOrderDetl.getOrderNo());
+ checkWaveDetl.setOrderNos(checkWaveDetl.getOrderNos() + "," +allOrderDetl.getOrderNo());
checkWaveDetl.setAnfme(checkWaveDetl.getAnfme() + allOrderDetl.getAnfme());
waveDetlService.update(checkWaveDetl,new EntityWrapper<WaveDetl>()
.eq("id",checkWaveDetl.getId()));
}
}
- System.out.println("done");
- return null;
+ /**
+ * 鍙嶅啓鍑哄簱鍗曡〃澶�
+ */
+ for (Order order : orders) {
+ order.setWaveNo(wave.getWaveNo());
+ order.setSettle(11L);
+ orderService.update(order,new EntityWrapper<Order>()
+ .eq("id",order.getId()));
+ }
+ return R.ok("宸茬敓鎴愭尝娆�");
}
}
--
Gitblit v1.9.1