From fecf9a8163a5563bc87f60405309eb4750a38504 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 24 十二月 2025 18:15:24 +0800
Subject: [PATCH] 出入库订单历史-增加变更业务时间记录展示
---
src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
index d34c648..8738156 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutLogController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.*;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
@@ -28,14 +29,16 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private OrderTimeChangeLogService orderTimeChangeLogService;
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
public R head(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String orderByField,
- @RequestParam(required = false) String orderByType,
- @RequestParam Map<String, Object> param) {
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakoutLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
@@ -44,7 +47,31 @@
} else {
wrapper.orderBy("create_time", false);
}
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderPakoutLog> page = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ // 鎵归噺鏌ヨ鍝簺璁㈠崟鏈夊彉鏇磋褰�
+ if (page.getRecords() != null && !page.getRecords().isEmpty()) {
+ java.util.List<Long> orderIds = new java.util.ArrayList<>();
+ for (OrderPakoutLog order : page.getRecords()) {
+ orderIds.add(order.getId());
+ }
+ if (!orderIds.isEmpty()) {
+ EntityWrapper<OrderTimeChangeLog> logWrapper = new EntityWrapper<>();
+ logWrapper.in("order_id", orderIds);
+ logWrapper.eq("order_type", 2); // 2:鍑哄簱
+ java.util.List<OrderTimeChangeLog> changeLogs = orderTimeChangeLogService.selectList(logWrapper);
+ java.util.Set<Long> orderIdsWithLog = new java.util.HashSet<>();
+ if (changeLogs != null) {
+ for (OrderTimeChangeLog log : changeLogs) {
+ orderIdsWithLog.add(log.getOrderId());
+ }
+ }
+ // 璁剧疆鏄惁鏈夊彉鏇磋褰曟爣璇�
+ for (OrderPakoutLog order : page.getRecords()) {
+ order.setHasChangeLog(orderIdsWithLog.contains(order.getId()));
+ }
+ }
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/order/detl/all/auth")
@@ -140,6 +167,49 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @PostMapping(value = "/order/update/orderTime/auth")
+ @ManagerAuth(memo = "淇敼鍘嗗彶鍗曟嵁涓氬姟鏃堕棿")
+ public R updateOrderTime(@RequestParam Long id, @RequestParam String orderTime, @RequestParam(required = false) String memo) {
+ if (Cools.isEmpty(id) || Cools.isEmpty(orderTime)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ OrderPakoutLog order = orderService.selectById(id);
+ if (order == null) {
+ return R.error("鍗曟嵁涓嶅瓨鍦�");
+ }
+ // 妫�鏌ユ槸鍚﹀凡缁戝畾鏈堢粨鍗曟嵁锛屽鏋滃凡缁戝畾鍒欑姝慨鏀�
+ if (order.getMonthlySettleId() != null && order.getMonthlySettleId() > 0) {
+ return R.error("璇ュ崟鎹凡缁戝畾鏈堢粨鍗曟嵁锛屼笉鑳戒慨鏀逛笟鍔℃椂闂�");
+ }
+ // 鑾峰彇鍘熶笟鍔℃椂闂达紙鍦ㄤ慨鏀瑰墠鑾峰彇锛�
+ String oldOrderTime = order.getOrderTime();
+ // 妫�鏌ユ柊鏃ф椂闂存槸鍚︾浉鍚�
+ if (oldOrderTime != null && oldOrderTime.equals(orderTime)) {
+ return R.error("鏂颁笟鍔℃椂闂翠笌鍘熶笟鍔℃椂闂寸浉鍚岋紝鏃犻渶淇敼");
+ }
+ // 鏇存柊涓氬姟鏃堕棿
+ order.setOrderTime(orderTime);
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼涓氬姟鏃堕棿澶辫触");
+ }
+ // 淇濆瓨鍙樻洿璁板綍锛堝彧鏈夋椂闂翠笉鍚屾椂鎵嶄繚瀛橈級
+ if (oldOrderTime != null && !oldOrderTime.equals(orderTime)) {
+ OrderTimeChangeLog changeLog = new OrderTimeChangeLog();
+ changeLog.setOrderId(order.getId());
+ changeLog.setOrderNo(order.getOrderNo());
+ changeLog.setOrderType(2); // 2:鍑哄簱
+ changeLog.setOldOrderTime(oldOrderTime);
+ changeLog.setNewOrderTime(orderTime);
+ changeLog.setMemo(memo);
+ changeLog.setCreateBy(getUserId());
+ changeLog.setCreateTime(new Date());
+ orderTimeChangeLogService.insert(changeLog);
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1