【bug】订单信息 修复新增默认当前人展示错误问题、修复序列号记录表唯一性问题、订单查询缺少是否已变更

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java

@@ -38,6 +38,7 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
                 .eq(reqVO.getDeliveryStatus() != null, ProjectOrderDO::getDeliveryStatus, reqVO.getDeliveryStatus())
                 .in(reqVO.getOrderStatusList() != null && !reqVO.getOrderStatusList().isEmpty(), ProjectOrderDO::getOrderStatus, reqVO.getOrderStatusList())
                 .eq(reqVO.getIsSnapshot() != null, ProjectOrderDO::getIsSnapshot, reqVO.getIsSnapshot())
+                .eq(reqVO.getHasAlter() != null, ProjectOrderDO::getHasAlter, reqVO.getHasAlter())
                 .like(!StringUtils.isEmpty(reqVO.getSnapshotCode()), ProjectOrderDO::getSnapshotCode, reqVO.getSnapshotCode());
         ;
         return selectPage(reqVO, query);

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

@@ -66,6 +66,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"

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

@@ -64,6 +64,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"

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

@@ -64,6 +64,21 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已变更" prop="hasAlter">
+        <el-select
+          v-model="queryParams.hasAlter"
+          placeholder="请选择是否有价格"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="单据状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"

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

@@ -1083,6 +1083,17 @@ const queryData = async (type: string, id?: number) => {
     if (userProfile.dept) {
       formData.value.businessDeptId = userProfile.dept.id
     }
+    // 判断远程查询中是否存在当前默认人 如无则手动设置
+    const hasContainMe = userSelectList.value.some(user => {
+      return user.id == formData.value.businessMan
+    })
+    if(!hasContainMe){
+      if(userSelectList.value.length == userParams.pageSize){
+        userSelectList.value.splice(userSelectList.value.length-1,1,
+          {id: userProfile.id, username: userProfile.username, nickname: userProfile.nickname})
+      }
+
+    }
   } finally {
     formLoading.value = false
   }

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

@@ -64,6 +64,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="是否已变更" prop="hasAlter">
+          <el-select
+            v-model="queryParams.hasAlter"
+            placeholder="请选择是否有价格"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="单据状态" prop="orderStatus">
           <el-select
             v-model="queryParams.orderStatus"

sql/v1.2.0/1.structure.sql

@@ -3,3 +3,6 @@ ALTER TABLE project_sale_order COMMENT '项目销售订单表';
 
 ALTER TABLE project_order_sub RENAME project_sale_order_sub;
 ALTER TABLE project_sale_order_sub COMMENT '项目销售订单子项表';
+
+ALTER TABLE base_serial_number DROP INDEX uk_business_segment;
+ALTER TABLE base_serial_number ADD UNIQUE INDEX `uk_business_segment` ( `business_type`, `segment`, `tenant_id` ) USING BTREE;