【功能优化】完善订单信息打印启动单

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java

@@ -219,9 +219,6 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
             // do nothing
             log.error("generate alterFieldNames error, id: {}, exception: {}", id, e.getMessage(), e);
         }
-        // 查询操作日志获取审核/批准
-
-
         return projectOrderDO;
     }
 

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue

@@ -170,6 +170,7 @@ import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@
 import { betweenDay, dateFormatter, formatDate } from '@/utils/formatTime'
 import { Check } from '@element-plus/icons-vue'
 import {getCustomer} from "@/api/heli/customer";
+import {getOperateLogPage} from "@/api/system/operatelog";
 const dialogVisible = ref(false) // 弹窗的是否展示
 
 const onPrint = () => {
@@ -305,7 +306,12 @@ const formData = ref({
   orderTime: new Date(),
   snapshotOrderTime: undefined,
   alterFieldNames: [],
-  customer: {}
+  customer: {},
+  creatorName: undefined,
+  auditTime: undefined,
+  auditUserName: undefined,
+  approveTime: undefined,
+  approveUserName: undefined
 })
 /** 打开弹窗 */
 const open = async (id?: number) => {
@@ -315,6 +321,21 @@ const open = async (id?: number) => {
   // 子项列表
   formData.value.projectOrderSubs = await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(id)
   formData.value.customer = await getCustomer(formData.value.customerId)
+  // 操作日志查询 并筛选审核/批准信息
+  let logParams = {
+    pageNo: 1,
+    pageSize: 2,
+    typeList: [9,10]
+  }
+  const logs = await getOperateLogPage(logParams)
+  if(logs.list && logs.list.length == 2){
+    const approveLog = logs.list[0]
+    const auditLog = logs.list[1]
+    formData.value.approveTime = approveLog.startTime
+    formData.value.approveUserName = approveLog.userNickname
+    formData.value.auditTime = auditLog.startTime
+    formData.value.auditUserName = auditLog.userNickname
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -361,7 +382,12 @@ const resetForm = () => {
     orderTime: new Date(),
     snapshotOrderTime: undefined,
     alterFieldNames: [],
-    customer: {}
+    customer: {},
+    creatorName: undefined,
+    auditTime: undefined,
+    auditUserName: undefined,
+    approveTime: undefined,
+    approveUserName: undefined
   }
 }
 </script>

sql/v1.1.0/heli.sql

@@ -172,4 +172,4 @@ from (
     from ((`mes-heli`.`wms_storage_mat` `mat`
         left join `mes-heli`.`wms_storage` `st` on((`mat`.`stock_id` = `st`.`id`)))
         left join `mes-heli`.`base_material` `bm` on((`mat`.`mat_id` = `bm`.`id`)))
-    where ((`mat`.`deleted` = 0) and (`st`.`status` <> 3) and (`st`.`deleted` = 0) and (`bm`.`deleted` = 0) and (`bm`.`status` = 1))) `t` group by `t`.`mat_id`
+    where ((`mat`.`deleted` = 0) and (`st`.`status` <> 3) and (`st`.`deleted` = 0) and (`bm`.`deleted` = 0) and (`bm`.`status` = 1))) `t` group by `t`.`mat_id`;