From 6f8cc73c7f986bc89ee1c6fc33c2a7d50cfa6c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 08:36:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8063a13..020d48a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.*;
+import com.zy.common.CodeRes;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -143,6 +146,17 @@
}
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("");
+ }
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
@@ -160,6 +174,8 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setPayment(1);
+ orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -333,5 +349,23 @@
}
return R.ok();
}
+ @RequestMapping(value = "/order/print/auth")
+ @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
+ public R orderPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<OrderDetl> res = new ArrayList<>();
+ for (String orderNo : param){
+ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ return R.ok().add(res);
+ }
+
+ @RequestMapping("/order/in")
+ public R in(@RequestBody JSONObject param){
+ System.out.println("111 = " + 111);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1