From 4b079b635d7d968496c7c13ab97a32fd815ebf43 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:40:36 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index 4b88046..7145160 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
@@ -11,8 +11,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CheckTaskListParam;
+import com.zy.asrs.entity.param.OpenAdjustmentOrderParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.CheckOrderExportDTO;
+import com.zy.asrs.enums.CheckStatusEnum;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
@@ -41,11 +43,13 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private OpenService openService;
@PostMapping(value = "/checkOrder/pdaComplete/auth")
@ManagerAuth(memo = "pda锛氬畬鎴愮洏鐐�")
public R checkOrderPdaComplete(@RequestBody CheckTaskListParam checkTaskListParam) {
- checkOrderService.pdaComplete(checkTaskListParam);
+ checkOrderService.pdaComplete(checkTaskListParam,getUserId());
return R.ok();
}
@@ -56,6 +60,7 @@
List<LocDto> locDtos = checkOrderService.preview(orderId);
return R.ok(locDtos);
}
+
@PostMapping(value = "/checkOrder/getTaskList/auth")
@ManagerAuth(memo = "pda锛氳幏鍙栫洏鐐逛换鍔″垪琛�")
public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
@@ -141,9 +146,9 @@
checkOrderDetl.setStatus(1);
checkOrderDetl.setZpallet(locDetl.getZpallet());
checkOrderDetl.setCreateBy(getUserId());
- checkOrderDetl.setCreateTime(now);
+// checkOrderDetl.setCreateTime(now);
checkOrderDetl.setUpdateBy(getUserId());
- checkOrderDetl.setUpdateTime(now);
+// checkOrderDetl.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
@@ -191,9 +196,9 @@
checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
checkOrderDetl1.setCreateBy(getUserId());
- checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
+// checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
checkOrderDetl1.setUpdateBy(getUserId());
- checkOrderDetl1.setUpdateTime(now);
+// checkOrderDetl1.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl1)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
@@ -342,4 +347,29 @@
return R.ok();
}
+
+ @PostMapping(value = "/adjustOrder/create/test")
+ @ManagerAuth(memo = "鍐呴儴娴嬭瘯锛氱敓鎴愯皟鏁村崟")
+ public R adjustOrderCreateTest(@RequestParam("orderId") Long orderId) {
+ CheckOrder checkOrder = checkOrderService.selectById(orderId);
+ List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
+ checkOrderDetls.forEach(checkOrderDetl -> { checkOrderDetl.setStatus(1);});
+ OpenAdjustmentOrderParam openAdjustmentOrderParam = new OpenAdjustmentOrderParam();
+ openAdjustmentOrderParam.setOrderTime(DateUtils.convert(new Date()));
+ openAdjustmentOrderParam.setOrderDetails(checkOrderDetls);
+
+ openService.adjustmentOrderCreate(openAdjustmentOrderParam);
+
+ return R.ok();
+
+ }
+
+ @PostMapping(value = "/adjustOrder/complete/auth")
+ @ManagerAuth(memo = "瀹屾垚璋冩暣鍗�")
+ public R adjustOrderComplete(@RequestParam("orderId") Long orderId) {
+ checkOrderService.adjustOrderComplete(orderId,getUserId());
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1