工艺设计增加规格，名称编码查询

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java

@@ -46,6 +46,9 @@ public class ProcessDesignPageReqVO extends PageParam {
     @Schema(description = "项目编号")
     private String projectCode;
 
+    @Schema(description = "规格")
+    private String spec;
+
     @Schema(description = "客户名称")
     private String customerName;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/processdesign/ProcessDesignMapper.java

@@ -119,8 +119,10 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
         query.in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList())
                 .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode())
                 .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName())
+                .like(!StringUtils.isEmpty(reqVO.getSpec()), MaterialDO::getSpec, reqVO.getSpec())
                 .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName())
                 .and(!StringUtils.isEmpty(reqVO.getProjectSubCode()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubCode()).or().like(MaterialDO::getCode, reqVO.getProjectSubCode()))
+                .and(!StringUtils.isEmpty(reqVO.getProjectSubName()), Wrapper -> Wrapper.like(MaterialDO::getName, reqVO.getProjectSubName()).or().like(MaterialDO::getCode, reqVO.getProjectSubName()))
         ;
         return selectPage(reqVO, query);
     }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -228,20 +228,20 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
     @Override
     public List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId) {
         List<TaskDispatchDetailDO> result = taskDispatchDetailMapper.selectListByDispatchId(dispatchId);
-        result.forEach(map ->{
+//        result.forEach(map ->{
-            List<Long> ids = new ArrayList<>();
+//            List<Long> ids = new ArrayList<>();
-            List<String> names = new ArrayList<>();
+//            List<String> names = new ArrayList<>();
-            if(map.getOwnerIds() != null){
+//            if(map.getOwnerIds() != null){
-                Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{
+//                Arrays.stream(map.getOwnerIds().split(",")).forEach(item ->{
-                    ids.add(Long.parseLong(item.trim()));
+//                    ids.add(Long.parseLong(item.trim()));
-                    names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname());
+//                    names.add(adminUserMapper.selectById(Long.parseLong(item.trim())).getNickname());
-                });
+//                });
-            }
+//            }
-
+//
-            map.setOwners(ids);
+//            map.setOwners(ids);
-            map.setOwnerNames(names);
+//            map.setOwnerNames(names);
-
+//
-        });
+//        });
         return result;
     }
 
@@ -397,7 +397,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
     private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
         list.forEach(o -> {
             o.setDispatchId(dispatchId);
-            o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]",""));
+//            o.setOwnerIds(o.getOwners().toString().replace("[","").replace("]",""));
         });
         // 分组更新与插入
         List<TaskDispatchDetailDO> updateList = list.stream().filter(o -> o.getId() != null).collect(Collectors.toList());

sql/v1.0.0/2.business/1.structure.sql

@@ -249,3 +249,4 @@ CREATE TABLE `base_process_setting` (
 
 alter table pro_task_dispatch_detail add column `owner_ids` VARCHAR(128) null comment '多个负责人' after `owner`;
 alter table pro_task_dispatch_detail modify column `owner` bigint(20) null comment '负责人' ;
+alter table pro_task_report add COLUMN `has_synch` tinyint(1) default null comment '是否已同步用友';