From 0f7b217568c29e871305b48accdb292593b07545 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 六月 2023 15:56:08 +0800
Subject: [PATCH] #平库库位优化
---
src/main/java/com/zy/asrs/controller/OrderController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 788843b..f605dde 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -36,6 +36,8 @@
private WaitPakinService waitPakinService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private OrderLogService orderLogService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -92,21 +94,21 @@
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
- int payment = 0;
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
if(!Cools.isEmpty(docType)){
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
- if (prefix.equals("CK")){
- payment = 1;
- }
if(Cools.isEmpty(param.getOrderNo())){
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
Order order = orderService.selectByNo(param.getOrderNo());
+ OrderLog orderLog = orderLogService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ if (orderLog != null) {
+ return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
}
Date now = new Date();
order = new Order(
@@ -178,7 +180,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- orderDetl.setPayment(payment);
+ if(orderDetl.getPayment() == null){
+ orderDetl.setPayment(0);
+ }
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
--
Gitblit v1.9.1