From 58bccbc9d1a23c8184217317a9a37345d98883c2 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 28 三月 2022 15:44:07 +0800
Subject: [PATCH] .
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 f8f15ea..29dd6ce 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -64,11 +64,15 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("update_time", false);
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ else {
+ wrapper.orderBy("create_time",false);
+ }
+
+ Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -203,6 +207,7 @@
*/
@RequestMapping("/orders/wave/auth")
@ManagerAuth
+ @Transactional
public R createWave(@RequestBody List<Order> orders){
/**
* 鎺х涓庡垵濮嬪寲
@@ -214,11 +219,9 @@
}
}
-
/**
* 鐢熸垚娉㈡琛ㄥご
*/
-
Wave wave = new Wave();
wave.setHostId(getHostId());
String s = UUID.randomUUID().toString().replace("-","");
@@ -227,12 +230,13 @@
String currNum = waveService.getCurrNum(waveNo);
if (!Cools.isEmpty(currNum)) {
String[] split = currNum.split("-");
- if (split.length < 2){
+ if (split.length < 3){
wave.setWaveNo(waveNo + "0001");
+ } else {
+ Integer newNum = Integer.parseInt(split[2]) + 1;
+ String format = AddZero.addZeroForNum(newNum + "", 4);
+ wave.setWaveNo(waveNo + format);
}
- Integer newNum = Integer.parseInt(split[2]) +1;
- String format = AddZero.addZeroForNum(newNum + "", 4);
- wave.setWaveNo(waveNo + format);
}else {
wave.setWaveNo(waveNo + "0001");
}
--
Gitblit v1.9.1