From 6cc705d10d7d0366eb7aa4797acdf137e4b7576f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 26 五月 2023 16:36:38 +0800
Subject: [PATCH] #平库盘点完成
---
src/main/java/com/zy/asrs/controller/OrderController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8f93ef0..244d8de 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
@@ -93,21 +95,25 @@
@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())){
- String prefix = "";
- DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
- prefix = docType.getPakin() == 1 ? "RK" : "CK";
- }
- if (prefix.equals("CK")){
- payment = 1;
- }
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(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
--
Gitblit v1.9.1