From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能
---
fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java b/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java
index dce8891..5c857d1 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java
@@ -1,8 +1,16 @@
package com.fzzy.work;
+import com.fzzy.igds.utils.DateUtil;
+import com.fzzy.work.data.WorkNode;
+import com.fzzy.work.data.WorkStatus;
+import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.domain.WorkOrderConf;
+import com.fzzy.work.domain.WorkOrderProcess;
import com.fzzy.work.service.WorkOrderConfService;
+import com.fzzy.work.service.WorkOrderProcessService;
+import com.fzzy.work.service.WorkOrderService;
import com.ruoyi.common.core.controller.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
@@ -10,10 +18,13 @@
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* 宸ュ崟绠＄悊
*/
+@Slf4j
@Controller
@RequestMapping("/work")
public class WorkOrderController extends BaseController {
@@ -23,6 +34,10 @@
@Resource
private WorkOrderConfService workOrderConfService;
+ @Resource
+ private WorkOrderProcessService workOrderProcessService;
+ @Resource
+ private WorkOrderService workOrderService;
/**
@@ -52,7 +67,7 @@
*
*/
@GetMapping("/flow-conf")
- public String noBusiness(@RequestParam("id") String id, ModelMap mmap) {
+ public String flowConf(@RequestParam("id") String id, ModelMap mmap) {
WorkOrderConf conf = workOrderConfService.selectById(id);
if (null == conf) conf = new WorkOrderConf();
@@ -61,4 +76,58 @@
return prefix + "/flow-conf";
}
-}
+
+
+ /**
+ * 宸ュ崟璁板綍
+ *
+ */
+ @GetMapping("/flow-his")
+ public String flowHis(@RequestParam("orderId") String orderId, ModelMap mmap) {
+ log.info("宸ュ崟璁板綍-宸ュ崟ID锛歿}", orderId);
+ List<WorkOrderProcess> list = workOrderProcessService.queryList(orderId);
+ mmap.put("list", list);
+ mmap.put("tipTime", "0鍒嗛挓");
+ mmap.put("tipCount", "0娆�");
+
+ if (null == list || list.isEmpty()) return prefix + "/flow-his";
+
+
+
+ //娆℃暟榛樿鍑忓幓绗竴娆℃彁浜�
+ mmap.put("tipCount", list.size() - 1 + "娆�");
+ WorkOrderProcess last = list.get(0);
+ if(!last.getNode().equals(WorkNode.NODE_END.getCode())){
+ long tipTime = DateUtil.difMin(list.get(0).getCreateTime(), new Date());
+ mmap.put("tipTime", tipTime + "鍒嗛挓");
+ }
+
+ return prefix + "/flow-his";
+ }
+
+ @GetMapping("/flow-his2")
+ public String flowHis2(@RequestParam("businessId") String businessId, ModelMap mmap) {
+ log.info("宸ュ崟璁板綍-涓氬姟ID锛歿}", businessId);
+
+ //鑾峰彇宸ュ崟
+ WorkOrder order = workOrderService.selectByBusinessId(businessId);
+ mmap.put("list", null);
+ mmap.put("tipTime", "0鍒嗛挓");
+ mmap.put("tipCount", "0娆�");
+ if (null == order) return prefix + "/flow-his";
+
+ List<WorkOrderProcess> list = workOrderProcessService.queryList(order.getId());
+
+ if (null == list || list.isEmpty()) return prefix + "/flow-his";
+
+ //娆℃暟榛樿鍑忓幓绗竴娆℃彁浜�
+ mmap.put("tipCount", list.size() - 1 + "娆�");
+ WorkOrderProcess last = list.get(0);
+ if(!last.getNode().equals(WorkNode.NODE_END.getCode())){
+ long tipTime = DateUtil.difMin(list.get(0).getCreateTime(), new Date());
+ mmap.put("tipTime", tipTime + "鍒嗛挓");
+ }
+
+ return prefix + "/flow-his";
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3