Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java

@@ -79,7 +79,7 @@ public class TaskDispatchDetailDO extends BaseDO {
     private Long deviceModel;
 
     @TableField(exist = false)
-    private Long deviceName;
+    private String deviceName;
     /**
      * 预计开始日期
      */

mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/index.vue

@@ -16,27 +16,18 @@
       <el-form-item label="所属车间" prop="workshopName">
         <WorkshopSelect v-model="queryParams.workshopId" class="!w-250px" @update:newValue="handleSelectedWorkshop" />
       </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
+        <el-form-item label="设备编号" prop="code">
           <el-input
-            v-model="queryParams.customerName"
-            placeholder="请输入客户名称"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-240px"
-          />
-        </el-form-item>
-        <el-form-item label="设备编号" prop="projectCode">
-          <el-input
-            v-model="queryParams.projectCode"
+            v-model="queryParams.code"
             placeholder="请输入设备编号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
           />
         </el-form-item>
-        <el-form-item label="设备名称" prop="projectName">
+        <el-form-item label="设备名称" prop="name">
           <el-input
-            v-model="queryParams.projectName"
+            v-model="queryParams.name"
             placeholder="请输入设备名称"
             clearable
             @keyup.enter="handleQuery"
@@ -54,12 +45,12 @@
     <ContentWrap>
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
         <el-table-column fixed label="序号" type="index" width="60" align="center" />
-         <el-table-column label="所属车间" align="center" prop="workshopName" />
-        <el-table-column fixed label="设备编号" align="center" prop="projectSubCode" min-width="140" />
-        <el-table-column fixed label="设备名称" align="center" prop="projectSubName" min-width="140" />
-        <el-table-column fixed label="设备型号" align="center" prop="projectSubName" min-width="140" />
-        <el-table-column fixed label="设备类型" align="center" prop="projectSubName" min-width="140" />
-        <el-table-column fixed label="累计工作时长(小时)" align="center" prop="projectSubName" min-width="140" />
+         <el-table-column label="所属车间" align="center" prop="workShopName" min-width="120"/>
+        <el-table-column  label="设备编号" align="center" prop="code" min-width="140" />
+        <el-table-column  label="设备名称" align="center" prop="name" min-width="140" />
+        <el-table-column  label="设备型号" align="center" prop="model" min-width="140" />
+        <el-table-column  label="设备类型" align="center" prop="type" min-width="140" />
+        <el-table-column  label="累计工作时长(小时)" align="center" prop="workTime" min-width="140" />
 
       </el-table>
       <!-- 分页 -->
@@ -76,7 +67,7 @@
 <script setup lang="ts">
 import {dateFormatter, dateFormatter2, formatDate} from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as ProcessDesignApi from '@/api/biz/processdesign'
+import * as EquipmanufactureApi from '@/api/biz/equipmanufacture'
 import {useCommonStateWithOut} from "@/store/modules/common";
 import {DICT_TYPE} from "@/utils/dict";
 import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
@@ -94,17 +85,9 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  workshopId:undefined,
-  planCode: undefined,
-  projectCode: undefined,
-  processDesignTypeList: ['BLUEPRINT_3D','BLUEPRINT_2D','BLUEPRINT_WORKBLANK'],
-  customerName: undefined,
-  projectName: undefined,
-  businessLine: undefined,
-  property: undefined,
-  projectSubName: undefined,
-  threeDimOwnerName: undefined,
-  isOverview: true
+  code:undefined,
+  name:undefined,
+  workshopId:undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -113,8 +96,9 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await ProcessDesignApi.getProcessDesignPage(queryParams)
+    const data = await EquipmanufactureApi.getEquipManufactureWorkTimePage(queryParams)
     list.value = data.list
+    // console.log(list.value);
     total.value = data.total
   } finally {
     loading.value = false
@@ -174,6 +158,6 @@ onMounted(() => {
 
 //接收车间传递的数据
 const handleSelectedWorkshop = (newValue: any) => {
-  queryParams.workshopId = newValue.id
+  queryParams.workshopId = newValue?.id
 }
 </script>

mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue

@@ -126,26 +126,26 @@
         <el-table-column label="生产车间" align="center" prop="spec" min-width="160" />
         <el-table-column label="派工工序" align="center" prop="procedureName" min-width="160" />
         <el-table-column label="负责人" align="center" prop="ownerName" min-width="120" />
-        <el-table-column label="生产设备" align="center" prop="deviceModel" min-width="120" />
-        <el-table-column
+        <el-table-column label="生产设备" align="center" prop="deviceName" min-width="120" />
+        <!-- <el-table-column
           label="预计生产日期"
           align="center"
           prop="workTime"
           :formatter="dateFormatter"
           min-width="220"
-        />
-        <!-- <el-table-column label="生产起止时间" align="center" prop="startTime" width="400">
+        /> -->
+        <el-table-column label="预计生产日期" align="center" prop="startTime" width="400">
           <template #default="scope">
-            {{formatDate(scope.row.startTime)+'~'+formatDate(scope.row.endTime)}}
+            {{formatDate(scope.row.startTime,'YYYY-MM-DD HH:mm')+'~'+formatDate(scope.row.endTime,'YYYY-MM-DD HH:mm')}}
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column label="单位" align="center" prop="unit" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
           </template>
         </el-table-column>
 
-        <el-table-column label="修改人" align="center" prop="updater" />
+        <el-table-column label="修改人" align="center" prop="updaterName" />
         <el-table-column
           label="修改时间"
           align="center"
@@ -222,6 +222,8 @@ const getList = async () => {
   try {
     const data = await TaskReportApi.getTaskDispatchProcedureDetailPages(queryParams)
     list.value = data.list
+    console.log(list.value);
+    
     total.value = data.total
   } finally {
     loading.value = false

mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/Dispatchdialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" style="width: 1200px">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" style="width: 1400px">
     <!-- 表格类信息 -->
     <el-card class="hl-card-info">
       <!-- <template #header>
@@ -293,10 +293,10 @@ const submitForm = async (operate) => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as TaskDispatchApi.TaskDispatchVO
-    // console.log(data);
-
     await TaskDispatchApi.SaveSubmissionWorkOrderDetails(data)
-    // message.success(t('common.operationSuccess'))
+    message.success(t('common.operationSuccess'))
+  dialogVisible.value = false
+
     // 发送操作成功的事件
     emit('success')
   } finally {

mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/index.vue

@@ -353,7 +353,7 @@ const outDispatching = () => {
       await TaskDispatchApi.CancellationWorkOrderDetails(data)
       ElMessage({
         type: 'success',
-        message: 'Delete completed'
+        message: '取消派工成功'
       })
       getList()
     })