物料重量计算公式

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java

@@ -171,4 +171,6 @@ public interface ErrorCodeConstants {
     ErrorCode TASK_IN_REPORT_NOT_REWORK = new ErrorCode(1_013_007 , "该报工没有完成，不允许返工，请确认");
     ErrorCode THIS_SHIPMENT_CANNOT_BE_INVALIDATED = new ErrorCode(1_013_008 , "该出库不允许作废，请刷新界面");
 
+    ErrorCode THERE_EXISTS_WEIGHT_CALCULATION_FORMULA = new ErrorCode(1_013_009 , "该物料类型存在重量计算公式，请确认");
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/formal/vo/FormalRespVO.java

@@ -37,4 +37,12 @@ public class FormalRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String creator;
+
+    @Schema(description = "创建者名称")
+    @ExcelProperty("创建者名称")
+    private String creatorName;
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/formal/vo/FormalSaveReqVO.java

@@ -23,8 +23,8 @@ public class FormalSaveReqVO {
     @Schema(description = "描述", example = "你猜")
     private String description;
 
-    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @NotNull(message = "状态,1表示正常，2表示禁用不能为空")
-    private Boolean status;
+    private Boolean status =  true;
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/formal/FormalDO.java

@@ -44,4 +44,7 @@ public class FormalDO extends BaseDO {
      */
     private Boolean status;
 
+    @TableField(exist = false)
+    private String creatorName;
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java

@@ -1,11 +1,14 @@
 package com.chanko.yunxi.mes.module.heli.dal.mysql.formal;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
-import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.formal.FormalDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.formal.vo.*;
 
@@ -18,13 +21,30 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.formal.vo.*;
 public interface FormalMapper extends BaseMapperX<FormalDO> {
 
     default PageResult<FormalDO> selectPage(FormalPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<FormalDO>()
+        MPJLambdaWrapper<FormalDO> query = new MPJLambdaWrapper<>();
-                .eqIfPresent(FormalDO::getMatType, reqVO.getMatType())
+        query.selectAll(FormalDO.class)
-                .eqIfPresent(FormalDO::getFormal, reqVO.getFormal())
+                .select("u.nickname as creatorName")
-                .eqIfPresent(FormalDO::getDescription, reqVO.getDescription())
+                .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, FormalDO::getCreator)
-                .eqIfPresent(FormalDO::getStatus, reqVO.getStatus())
+                .eq(reqVO.getMatType() != null, FormalDO::getMatType, reqVO.getMatType())
-                .betweenIfPresent(FormalDO::getCreateTime, reqVO.getCreateTime())
+                .eq(reqVO.getFormal() != null, FormalDO::getFormal, reqVO.getFormal())
-                .orderByDesc(FormalDO::getId));
+                .eq(reqVO.getStatus() != null, FormalDO::getStatus, reqVO.getStatus())
+                .disableSubLogicDel();
+//        if (reqVO.getCreateTime() != null) {
+//            LocalDateTime endDateTime = reqVO.getCreateTime()[1];
+//            // 重置时间为 23:59:59
+//            LocalDateTime endOfDay = endDateTime
+//                    .withHour(23)
+//                    .withMinute(59)
+//                    .withSecond(59);
+//            query.between(FormalDO::getCreateTime, reqVO.getCreateTime()[0], endOfDay);
+//        }
+        return selectPage(reqVO, query);
+    }
+    // 查询当前物料类型计算公式
+    default FormalDO selectOneByMatType(String matType) {
+        return selectOne(new MPJLambdaWrapper<FormalDO>()
+                .eq(FormalDO::getMatType, matType)
+                .eq(FormalDO::getStatus, true)
+                .disableSubLogicDel());
     }
-
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/formal/FormalServiceImpl.java

@@ -31,6 +31,11 @@ public class FormalServiceImpl implements FormalService {
 
     @Override
     public Long createFormal(FormalSaveReqVO createReqVO) {
+        // 校验存在
+        FormalDO formalDO = formalMapper.selectOneByMatType(createReqVO.getMatType());
+        if (formalDO != null) {
+            throw exception(THERE_EXISTS_WEIGHT_CALCULATION_FORMULA);
+        }
         // 插入
         FormalDO formal = BeanUtils.toBean(createReqVO, FormalDO.class);
         formalMapper.insert(formal);
@@ -40,6 +45,11 @@ public class FormalServiceImpl implements FormalService {
 
     @Override
     public void updateFormal(FormalSaveReqVO updateReqVO) {
+        FormalDO formalDO = formalMapper.selectOneByMatType(updateReqVO.getMatType());
+        if (formalDO != null && !formalDO.getId().equals(updateReqVO.getId())) {
+            throw exception(THERE_EXISTS_WEIGHT_CALCULATION_FORMULA);
+        }
+
         // 校验存在
         validateFormalExists(updateReqVO.getId());
         // 更新
@@ -57,7 +67,7 @@ public class FormalServiceImpl implements FormalService {
 
     private void validateFormalExists(Long id) {
         if (formalMapper.selectById(id) == null) {
-//            throw exception(FORMAL_NOT_EXISTS);
+            throw exception(THE_DATA_DOES_NOT_EXIST);
         }
     }
 

mes-ui/mes-ui-admin-vue3/src/utils/dict.ts

@@ -305,4 +305,6 @@ export enum DICT_TYPE {
   HELI_PLAN_TASK_STATUS = 'heli_plan_task_status', //bom状态
 
 
+  HELI_FOR_MAT_TYPE = 'for_mat_type', // 物料类型
+
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" @close="emits" width="900px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,31 +7,40 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="物料类型(1、块料 2、棒料 3、方料)" prop="matType">
+      <el-form-item label="物料类型" prop="matType">
-        <el-select v-model="formData.matType" placeholder="请选择物料类型(1、块料 2、棒料 3、方料)">
+        <el-select v-model="formData.matType" placeholder="请选择物料类型" disabled>
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_FOR_MAT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="计算公式" prop="formal">
         <el-input v-model="formData.formal" placeholder="请输入计算公式" />
       </el-form-item>
       <el-form-item label="描述" prop="description">
-        <Editor v-model="formData.description" height="150px" />
+        <el-input type="textarea" :rows="3" placeholder="请输入描述"
-      </el-form-item>
+                  v-model="formData.description"/>
-      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio label="1">请选择字典生成</el-radio>
-        </el-radio-group>
       </el-form-item>
+
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-radio-group v-model="formData.status">-->
+<!--          <el-radio :label="true">正常</el-radio>-->
+<!--          <el-radio :label="false">禁用</el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="emits">取 消</el-button>
     </template>
   </Dialog>
 </template>
 <script setup lang="ts">
 import * as FormalApi from '@/api/heli/formal'
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -45,14 +54,20 @@ const formData = ref({
   matType: undefined,
   formal: undefined,
   description: undefined,
-  status: undefined,
+  status: true,
 })
 const formRules = reactive({
+  matType: [{ required: true, message: '物料类型不能为空', trigger: 'blur' }],
   formal: [{ required: true, message: '计算公式不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
+  // status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
+const emits = async () => {
+  dialogVisible.value = false
+  emit('success')
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -64,6 +79,10 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await FormalApi.getFormal(id)
+      // 确保 matType 类型为数字，以便正确匹配字典的 label
+      if (formData.value.matType !== undefined && formData.value.matType !== null) {
+        formData.value.matType = Number(formData.value.matType)
+      }
     } finally {
       formLoading.value = false
     }

mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue

@@ -6,48 +6,58 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="100px"
     >
-      <el-form-item label="物料类型(1、块料 2、棒料 3、方料)" prop="matType">
+      <el-form-item label="物料类型" prop="matType">
         <el-select
           v-model="queryParams.matType"
-          placeholder="请选择物料类型(1、块料 2、棒料 3、方料)"
+          placeholder="请选择物料类型"
           clearable
-          class="!w-240px"
+          class="!w-260px"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_FOR_MAT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="计算公式" prop="formal">
+<!--      <el-form-item label="计算公式" prop="formal">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.formal"
+<!--          v-model="queryParams.formal"-->
-          placeholder="请输入计算公式"
+<!--          placeholder="请输入计算公式"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter="handleQuery"
+<!--          @keyup.enter="handleQuery"-->
-          class="!w-240px"
+<!--          class="!w-260px"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
-      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
+<!--      <el-form-item label="状态" prop="status">-->
-        <el-select
+<!--        <el-select-->
-          v-model="queryParams.status"
+<!--          v-model="queryParams.status"-->
-          placeholder="请选择状态,1表示正常，2表示禁用"
+<!--          placeholder="请选择状态"-->
-          clearable
+<!--          clearable-->
-          class="!w-240px"
+<!--          class="!w-260px"-->
-        >
+<!--        >-->
-          <el-option label="请选择字典生成" value="" />
+<!--          <el-option-->
-        </el-select>
+<!--              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"-->
-      </el-form-item>
+<!--              :key="dict.value"-->
-      <el-form-item label="创建时间" prop="createTime">
+<!--              :label="dict.label"-->
-        <el-date-picker
+<!--              :value="dict.value"-->
-          v-model="queryParams.createTime"
+<!--          />-->
-          value-format="YYYY-MM-DD HH:mm:ss"
+<!--        </el-select>-->
-          type="daterange"
+<!--      </el-form-item>-->
-          start-placeholder="开始日期"
+<!--      <el-form-item label="创建时间" prop="createTime">-->
-          end-placeholder="结束日期"
+<!--        <el-date-picker-->
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+<!--          v-model="queryParams.createTime"-->
-          class="!w-240px"
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
-        />
+<!--          type="daterange"-->
-      </el-form-item>
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-260px"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -59,15 +69,15 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
+<!--        <el-button-->
-          type="success"
+<!--          type="success"-->
-          plain
+<!--          plain-->
-          @click="handleExport"
+<!--          @click="handleExport"-->
-          :loading="exportLoading"
+<!--          :loading="exportLoading"-->
-          v-hasPermi="['heli:formal:export']"
+<!--          v-hasPermi="['heli:formal:export']"-->
-        >
+<!--        >-->
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+<!--          <Icon icon="ep:download" class="mr-5px" /> 导出-->
-        </el-button>
+<!--        </el-button>-->
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -75,17 +85,30 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="自增字段，唯一" align="center" prop="id" />
+<!--      <el-table-column label="自增字段，唯一" align="center" prop="id" />-->
-      <el-table-column label="物料类型(1、块料 2、棒料 3、方料)" align="center" prop="matType" />
+      <el-table-column type="index" width="100" fixed label="序号" align="center" />
+      <el-table-column label="物料类型" align="center" prop="matType" >
+      <template #default="scope">
+        <dict-tag :type="DICT_TYPE.HELI_FOR_MAT_TYPE" :value="scope.row.matType" />
+      </template>
+      </el-table-column>
       <el-table-column label="计算公式" align="center" prop="formal" />
+<!--      <el-table-column label="状态" align="center" prop="status" >-->
+<!--        <template #default="scope">-->
+<!--          <el-tag :type="scope.row.status ? 'success' : 'info'">-->
+<!--            {{ scope.row.status ? '是' : '否' }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="描述" align="center" prop="description" />
-      <el-table-column label="状态,1表示正常，2表示禁用" align="center" prop="status" />
+      <el-table-column label="创建者" align="center" prop="creatorName" />
+
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="200px"
       />
       <el-table-column label="操作" align="center">
         <template #default="scope">
@@ -126,6 +149,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as FormalApi from '@/api/heli/formal'
 import FormalForm from './FormalForm.vue'
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 
 defineOptions({ name: 'Formal' })
 

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -43,11 +43,11 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)" :key="dict.val
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="industry" label="单据状态">
-                  <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-700px" disabled>
+                  <el-radio-group v-model="formData.status" :disabled="true">
-                    <el-option
+                    <el-radio :label="1">正常</el-radio>
-v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)" :key="dict.value"
+                    <el-radio :label="2">已提交</el-radio>
-                      :label="dict.label" :value="dict.value" />
+                    <el-radio :label="3">已作废</el-radio>
-                  </el-select>
+                  </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>