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

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

@@ -65,6 +65,9 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
         // 插入子表
         createProjectOrderSubList(projectOrder.getId(), createReqVO.getProjectOrderSubs());
         createReqVO.setId(projectOrder.getId());
+
+        // 回写序列记录
+        serialNumberService.updateSerialNumber(serialNumberDO);
         // 返回
         return projectOrder.getId();
     }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberService.java

@@ -30,6 +30,13 @@ public interface SerialNumberService {
      */
     void updateSerialNumber(@Valid SerialNumberSaveReqVO updateReqVO);
 
+    /**
+     * 更新序列号记录
+     *
+     * @param serialNumberDO 更新信息
+     */
+    void updateSerialNumber(SerialNumberDO serialNumberDO);
+
     /**
      * 删除序列号记录
      *

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/serialnumber/SerialNumberServiceImpl.java

@@ -50,6 +50,11 @@ public class SerialNumberServiceImpl implements SerialNumberService {
         serialNumberMapper.updateById(updateObj);
     }
 
+    @Override
+    public void updateSerialNumber(SerialNumberDO serialNumberDO) {
+        serialNumberMapper.updateById(serialNumberDO);
+    }
+
     @Override
     public void deleteSerialNumber(Long id) {
         // 校验存在

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue

@@ -0,0 +1,65 @@
+<template>
+  <!-- 班组选择 -->
+  <el-select
+    v-model="valueName"
+    placeholder="请输入班组"
+    :remote-method="remoteMethod"
+    remote-show-suffix
+    remote
+    clearable
+    reserve-keyword
+    filterable
+    :loading="Loading"
+    @change="onSelectChange"
+  >
+    <el-option
+      v-for="item in classesSelectList"
+      :key="item.id"
+      :label="item.name"
+      :value="item.id"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, toRefs } from 'vue'
+import * as ClassesApi from '@/api/heli/classes'
+const valueName: any = ref() //选中的值
+const classesList = ref<ClassesApi.ClassesVO[]>([]) // 用户列表
+const classesSelectList = ref<ClassesApi.ClassesVO[]>([])
+const Loading = ref(false)
+
+// 初始化用户列表
+onMounted(async () => {
+  const queryParams = {
+    pageNo: 1,
+    pageSize: 10,
+    code: undefined,
+    brief: undefined,
+    status: undefined
+  }
+  try {
+    const data = await ClassesApi.getClassesPage(queryParams)
+    console.log(data.list)
+    classesList.value = data.list
+    // 设置初始值，如果需要的话
+    remoteMethod('')
+  } catch (error) {
+    console.error(error)
+  }
+})
+
+const remoteMethod = (query: any) => {
+  if (query) {
+    Loading.value = true
+    setTimeout(() => {
+      Loading.value = false
+      classesSelectList.value = classesList.value
+        .filter((item) => item.name.toLowerCase().includes(query.toLowerCase()))
+        .slice(0, 10) //只显示前10个
+    }, 200)
+  } else {
+    classesSelectList.value = classesList.value.slice(0, 10)
+  }
+}
+</script>

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

@@ -9,6 +9,7 @@
       <el-row style="font-size: 20px; font-weight: 700;margin-bottom: 30px">
         <el-col :span="1"> 部门 </el-col>
         <el-col :span="1"> 车间 </el-col>
+        <el-col :span="1"> 班组 </el-col>
         <el-col :span="1"> 职工 </el-col>
         <el-col :span="1"> 客户</el-col>
         <el-col :span="1"> 供应商</el-col>

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue

@@ -12,6 +12,9 @@
       </el-form-item>
       <el-form-item label="车间" prop="workshopId">
         <WorkshopSelect v-model="formData.workshopId" />
+      </el-form-item>
+       <el-form-item label="班组" prop="classesId">
+        <ClassesSelect v-model="formData.classesId" />
       </el-form-item>
       <el-form-item label="职工" prop="leaderUserId">
         <UserSelect v-model="formData.leaderUserId" />
@@ -49,6 +52,7 @@ import SupplierSelect from '../hlvuestyle/supplierSelect.vue'
 import CompositionSelect from '../hlvuestyle/compositionSelect.vue'
 import WorkshopSelect from '../hlvuestyle/workshopSelect.vue'
 import MaterialSelect from '../hlvuestyle/materialSelect.vue'
+import ClassesSelect from '../hlvuestyle/classesSelect.vue'
 
 defineOptions({ name: 'SystemDeptForm' })
 
@@ -68,6 +72,7 @@ const formData: any = ref({
   compositionId: undefined,
   workshopId: undefined,
   materialId: undefined,
+  classesId:undefined,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive<FormRules>({
@@ -123,6 +128,10 @@ const resetForm = () => {
   leaderUserId: undefined,
   clientId: undefined,
   supplierId: undefined,
+  compositionId: undefined,
+  workshopId: undefined,
+  materialId: undefined,
+  classesId:undefined,
   status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()

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

@@ -74,7 +74,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="检验要求" prop="qualityRequirement">
-                  <el-input type="textarea" v-model="formData.qualityRequirement" placeholder="请输入检验要求" />
+                  <el-input type="textarea" v-model="formData.qualityRequirement" placeholder="请输入检验要求" show-word-limit maxlength="200"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -476,7 +476,6 @@
                       删除
                     </el-button>
                     <el-button v-if="!!scope.row.id" link type="primary" size="small" @click="downloadAttachment(scope.row.name, scope.row.url)"> 下载 </el-button>
-                    <el-button v-if="!!scope.row.id" link type="primary" size="small" @click="window.open(scope.row.url)"> 查看 </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -575,7 +574,7 @@ const formData = ref({
   blueprintNo: undefined,
   hasPrice: 1,
   price: undefined,
-  currency: 1,
+  currency: "1",
   projectStartTime: undefined,
   projectEndTime: undefined,
   isUrgency: 0,
@@ -777,11 +776,11 @@ const submitForm = async (active) => {
     message.success(t('common.operationSuccess'))
     // 上传附件
     if(contractUploadFiles.value.length > 0){
-      contractUploadData.value = {'businessType': 'PROJECT_ORDER', 'businessId': orderId, 'businessFileType': 'CONTRACT'};
+      contractUploadData.value.businessId = orderId
       contractUploadRef.value!.submit();
     }
     if(protocolUploadFiles.value.length > 0){
-      protocolUploadData.value = {'businessType': 'PROJECT_ORDER', 'businessId': orderId, 'businessFileType': 'TECHNOLOGY_PROTOCOL'};
+      protocolUploadData.value.businessId = orderId
       protocolUploadRef.value!.submit();
     }
     // 成功后刷新
@@ -816,11 +815,11 @@ const onDeleteItem = (index) => {
 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
 const contractUploadRef = ref();
 const contractUploadFiles = ref<UploadUserFile[]>([]);
-const contractUploadData = ref({});
+const contractUploadData = ref({'businessType': 'PROJECT_ORDER', 'businessId': formData.value.id, 'businessFileType': 'CONTRACT'});
 
 const protocolUploadRef = ref();
 const protocolUploadFiles = ref<UploadUserFile[]>([]);
-const protocolUploadData = ref({});
+const protocolUploadData = ref({'businessType': 'PROJECT_ORDER', 'businessId': formData.value.id, 'businessFileType': 'TECHNOLOGY_PROTOCOL'});
 
 const contractUploadChange = (file, files) => {
   contractUploadFiles.value = files;
@@ -886,7 +885,7 @@ const resetForm = () => {
     blueprintNo: undefined,
     hasPrice: 1,
     price: undefined,
-    currency: 1,
+    currency: "1",
     projectStartTime: undefined,
     projectEndTime: undefined,
     isUrgency: 0,
@@ -912,6 +911,9 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
+const openMe = (url) => {
+  window.open(url)
+}
 onMounted(() => {
   queryData(query.active, query.id);
 })

sql/v1.1.0/heli.sql

@@ -93,7 +93,7 @@ CREATE TABLE `project_order` (
                                  `deleted` BIT ( 1 ) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                  `tenant_id` BIGINT ( 20 ) NOT NULL DEFAULT '0' COMMENT '租户编号',
                                  PRIMARY KEY ( `id` ) USING BTREE,
-                                 UNIQUE KEY `idx_code` ( `code` ) USING BTREE
+                                 UNIQUE KEY `uk_code` (`code`) USING BTREE
 ) ENGINE = InnoDB COMMENT = '项目订单表';
 
 DROP TABLE IF EXISTS project_order_sub;
@@ -113,7 +113,7 @@ CREATE TABLE `project_order_sub` (
                                      `deleted` BIT ( 1 ) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                      `tenant_id` BIGINT ( 20 ) NOT NULL DEFAULT '0' COMMENT '租户编号',
                                      PRIMARY KEY ( `id` ) USING BTREE,
-                                     UNIQUE KEY `idx_name` ( `name` ) USING BTREE
+                                     UNIQUE KEY `uk_project_name` (`project_order_id`,`name`) USING BTREE
 ) ENGINE = InnoDB COMMENT = '项目订单子项目表';
 
 ALTER TABLE project_order ADD COLUMN `contract_no` VARCHAR ( 128 ) COMMENT '模具名称' AFTER customer_id;