From 5f11ea001adbff091b62d6632d1a589614ba0074 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 10:03:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 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 950d8a6..788843b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -34,6 +34,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -90,12 +92,16 @@
@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())){
- String prefix = "";
- DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
- prefix = docType.getPakin() == 1 ? "RK" : "CK";
- }
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
Order order = orderService.selectByNo(param.getOrderNo());
@@ -144,6 +150,14 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ if (Cools.isEmpty(orderDetl.getOwner())){
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
+ }else {
+ LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
+ if (Cools.isEmpty(locOwner)){
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
+ }
+ }
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
@@ -164,6 +178,8 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setPayment(payment);
+ orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
--
Gitblit v1.9.1