后台代码业务更新

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskNodeService.java

@@ -166,4 +166,6 @@ public interface TaskNodeService extends SuperService<TaskNode> {
     R callRobot(Map<String, Object> map);
 
     R printCode(Map<String, Object> map);
+
+    List<TaskNode> getFanManNodes(TaskNode taskNode, String callType);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -609,6 +609,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                 }
                 for(BomProcedure bomProcedure : bomProcedures){
                     if(CollectionUtil.isEmpty(bomProcedure.getProductionresourceList())){
+                        System.out.println(bomProcedure.toString());
                         return R.fail("当前排产零件中存在未配置加工设备、设备不在线或报警，无法进行排产");
                     }
                 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -894,8 +894,8 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
     @Override
     public List<BomProcedureTray> getPreProcedureTray(Map map) {
         BomProcedureVersion bean = new BomProcedureVersion();
-        BeanUtil.copyProperties(map,bean);
-        bean = baseMapper.selectById(bean.getId());
+        BeanUtil.copyProperties(map,bean, "id");
+        bean = baseMapper.selectById(map.get("id").toString());
         //固定请求查询上一序
         bean.setTrayConf("2");
         return getPreProcedureTray( bean);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ProductionresourceBizServiceImpl.java

@@ -56,8 +56,14 @@ public class ProductionresourceBizServiceImpl extends SuperServiceImpl<Productio
         List<Map> list = returnMap.get("data")==null?new ArrayList():(List)returnMap.get("data");
         list.stream().map((item) -> {
            String id = item.get("id").toString();
-           List businessList = resourceBusinessService.list(Wraps.<ResourceBusiness>lbQ().in(ResourceBusiness::getResourceId,id));
-            item.put("businessList", CollectionUtil.isEmpty(businessList)?new ArrayList<>():businessList);
+           String moduleId = item.get("moduleId").toString();
+            LbqWrapper<ResourceBusiness> lbqWrapper = new LbqWrapper<ResourceBusiness>();
+            lbqWrapper.in(ResourceBusiness::getResourceId,id);
+            lbqWrapper.or(wrapper->{
+                wrapper.eq(ResourceBusiness::getModuleId, moduleId).eq(ResourceBusiness::getResourceId, "0");
+            }).orderByAsc(ResourceBusiness::getResourceId);
+            List businessList = resourceBusinessService.list(lbqWrapper);
+            item.put("businessList", CollectionUtil.isEmpty(businessList)?new ArrayList<>():businessList.stream().distinct().collect(Collectors.toList()));
             return item;
         }).collect(Collectors.toList());
         return returnMap;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -293,6 +293,8 @@
         SELECT
           itt.id,
           itt.order_id AS orderId,
+          itt.procedure_sort AS procedureSort,
+          ioo.prority AS prority,
           ibbp.name AS taskName,
           ibbp.remark AS content,
           ibbp.no AS taskNo,
@@ -300,6 +302,7 @@
           itt.task_no AS no,
           ibb.name,
           (SELECT itt1.no FROM  imcs_t_tray itt1, imcs_b_bom_procedure_tray ibbpt1 WHERE ibbpt1.biz_type = 1 AND itt1.id = ibbpt1.tray_id AND ibbpt1.procedure_id = ibbp.id) AS trayNo,
+          (SELECT itt1.id FROM  imcs_t_tray itt1, imcs_b_bom_procedure_tray ibbpt1 WHERE ibbpt1.biz_type = 1 AND itt1.id = ibbpt1.tray_id AND ibbpt1.procedure_id = ibbp.id) AS trayId,
           imfc.id  AS clampId,
           imfc.no  AS clampNo,
           imfc.name  AS clampName,
@@ -325,11 +328,12 @@
              imcs_b_bom_procedure_tray ibbpt,
              imcs_b_bom ibb,
              imcs_m_frock_clamp imfc,
-             imcs_m_meterial imm
+             imcs_m_meterial imm,
+             imcs_o_order ioo
         WHERE 1=1
         AND ipp.id = itt.plan_id
         AND ipp.produce_status = '2'
-        AND itt.status IN  ('1','2')
+        AND itt.status IN  ('2')
         AND itt.id = ittn.task_id
         AND ittn.exe_status IN ('2')
         AND ittn.interface_type =  '04'
@@ -339,8 +343,9 @@
         AND ibbpt.biz_type='2'
         AND imfc.id = ibbpt.tray_id
         AND imm.id = ibb.meterial_id
+        AND ipp.order_id = ioo.id
         AND itt.resource_id = #{resourceId}
-        ORDER BY ittn.exe_status DESC, ittn.complete_batch_sort, itt.expect_start_time LIMIT 0, 6
+        ORDER BY ittn.exe_status DESC, ioo.prority desc, itt.procedure_order desc, ittn.complete_batch_sort, itt.expect_start_time LIMIT 0, 6
     </select>
     <select id="selectTotalMachineUseTime" resultType="java.lang.Integer">
         SELECT

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/TrayMapper.xml

@@ -13,6 +13,7 @@
         <result column="no" jdbcType="VARCHAR" property="no"/>
         <result column="brand" jdbcType="VARCHAR" property="brand"/>
         <result column="production_type" jdbcType="VARCHAR" property="productionType"/>
+        <result column="category_type" jdbcType="VARCHAR" property="categoryType"/>
         <result column="num" jdbcType="INTEGER" property="num"/>
         <result column="specification" jdbcType="VARCHAR" property="specification"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
@@ -22,7 +23,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,material_type,factory,period,expiry_date,join_date,
-        name, no, zone_id, num, specification,production_type,five_axis,status,positionSort,org_id
+        name, no, zone_id, num, specification,production_type,category_type,five_axis,status,positionSort,org_id
     </sql>
 
     <!-- 分页 -->

imcs-admin-boot/imcs-business-controller/pom.xml

@@ -64,6 +64,34 @@
             <groupId>com.github.zuihou</groupId>
             <artifactId>zuihou-databases</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
     </dependencies>
 
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/edgeLibrary/StockLogController.java

@@ -50,21 +50,10 @@ public class StockLogController extends SuperController<StockLogService, Long, S
         QueryWrap<StockLog> wrap = handlerWrapper(null, params);
         LbqWrapper<StockLog> wrapper = wrap.lambda();
         StockLog stockLog = BeanUtil.toBean(data, StockLog.class);
-//        List<String> idList = new ArrayList<>();
-//        if("1".equals(stockLog.getDataStatus())){
-//            idList.add("1");
-//            idList.add("2");
-//            idList.add("3");
-//            idList.add("4");
-//            idList.add("5");
-//        }
-//        if("2".equals(stockLog.getDataStatus())){
-//            idList.add("6");
-//            idList.add("7");
-//        }
 
         wrapper.eq(StockLog::getStorgeId,stockLog.getStorgeId())
                 .eq(StockLog::getOptType,data.getOptType())
+                .eq(StockLog::getUniqueCode, data.getUniqueCode())
                 .geHeader(StockLog::getCreateTime, data.getStartCreateTime())
                 .leFooter(StockLog::getCreateTime, data.getEndCreateTime())
                 .orderByDesc(StockLog::getCreateTime);

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/TTaskPageDTO.java

@@ -112,6 +112,10 @@ public class TTaskPageDTO implements Serializable {
      */
     @ApiModelProperty(value = "优先级")
     private Integer prority;
+
+    @ApiModelProperty(value = "动态优先级排序")
+    private Integer procedureOrder;
+
     /**
      * 草稿标志(1-草稿0-非草稿)
      */

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/TTaskSaveDTO.java

@@ -146,4 +146,7 @@ public class TTaskSaveDTO implements Serializable {
     @Length(max = 32, message = "任务批次号长度不能超过32")
     private String taskBatchNo;
 
+    @ApiModelProperty(value = "动态优先级排序")
+    private Integer procedureOrder;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/TTaskUpdateDTO.java

@@ -150,4 +150,7 @@ public class TTaskUpdateDTO implements Serializable {
     @ApiModelProperty(value = "任务批次号")
     @Length(max = 32, message = "任务批次号长度不能超过32")
     private String taskBatchNo;
+
+    @ApiModelProperty(value = "动态优先级排序")
+    private Integer procedureOrder;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTask.java

@@ -402,6 +402,10 @@ public class TTask extends Entity<Long> implements Serializable {
     @TableField(value = "procedure_sort", condition = LIKE)
     private Integer procedureSort;
 
+    @ApiModelProperty(value = "动态优先级排序")
+    @TableField(value = "procedure_order", condition = LIKE)
+    private Integer procedureOrder;
+
     @ApiModelProperty(value="可执行设备(位置)")
     @TableField(exist = false)
     private List<BomProcedureProductionresource> productionresourceList;

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayPageDTO.java

@@ -88,9 +88,13 @@ public class TrayPageDTO implements Serializable {
     private Long zoneId;
 
     @ApiModelProperty(value = "产品分类")
-    @Length(max = 64, message = "品牌长度不能超过64")
+    @Length(max = 64, message = "托盘类型不能超过64")
     private RemoteData<String, String> productionType;
 
+    @ApiModelProperty(value = "托盘类型")
+    @Length(max = 32, message = "托盘类型不能超过32")
+    private RemoteData<String, String> categoryType;
+
     @ApiModelProperty(value = "是否五轴（0-否1-是）")
     private Integer fiveAxis;
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TraySaveDTO.java

@@ -106,6 +106,9 @@ public class TraySaveDTO implements Serializable {
     @ApiModelProperty(value = "产品分类")
     private RemoteData<String, String> productionType;
 
+    @ApiModelProperty(value = "托盘类型")
+    private RemoteData<String, String> categoryType;
+
     @ApiModelProperty(value = "是否五轴（0-否1-是）")
     private Integer fiveAxis;
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayUpdateDTO.java

@@ -107,6 +107,9 @@ public class TrayUpdateDTO implements Serializable {
     @ApiModelProperty(value = "产品分类")
     private RemoteData<String, String> productionType;
 
+    @ApiModelProperty(value = "托盘类型")
+    private RemoteData<String, String> categoryType;
+
     @ApiModelProperty(value = "是否五轴（0-否1-是）")
     private Integer fiveAxis;
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Tray.java

@@ -147,10 +147,18 @@ public class Tray extends Entity<Long> {
     @ApiModelProperty(value = "产品分类")
     @InjectionField(api = DICTIONARY_ITEM_CLASS, method = DICTIONARY_ITEM_METHOD, dictType = DictionaryType.BUSINESS_PRODUCT_TYPE)
     @TableField(value = "production_type", condition = LIKE)
-    @Length(max = 64, message = "品牌长度不能超过64")
+    @Length(max = 64, message = "产品分类不能超过64")
     @Excel(name = "产品分类")
     private RemoteData<String, String> productionType;
 
+    @ApiModelProperty(value = "产品分类")
+    @InjectionField(api = DICTIONARY_ITEM_CLASS, method = DICTIONARY_ITEM_METHOD, dictType = DictionaryType.TRAY_CATEGORY_TYPE)
+    @TableField(value = "category_type", condition = LIKE)
+    @Length(max = 32, message = "产品分类不能超过32")
+    @Excel(name = "产品分类")
+    private RemoteData<String, String> categoryType;
+
+
     @ApiModelProperty(value = "是否五轴（0-否1-是）")
     @TableField(value = "five_axis", condition = LIKE)
     @Excel(name = "是否五轴")

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/dto/ResourceBusinessSaveDTO.java

@@ -36,6 +36,13 @@ public class ResourceBusinessSaveDTO implements Serializable {
     @ApiModelProperty(value = "业务设备ID")
     @NotNull(message = "业务设备ID不能为空")
     private Long resourceId;
+
+    /**
+     * 模块ID
+     */
+    @ApiModelProperty(value = "模块ID")
+    @NotNull(message = "模块ID不能为空")
+    private Long moduleId;
     /**
      * 名称
      */

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/ResourceBusiness.java

@@ -78,17 +78,29 @@ public class ResourceBusiness extends Entity<Long> {
     @NotNull(message = "设备ID不能为空")
     private Long resourceId;
 
+
+    /**
+     * 模块ID
+     */
+    @ApiModelProperty(value = "模块ID")
+    @TableField(value = "module_id", condition = LIKE)
+    @Excel(name = "模块ID")
+    @NotNull(message = "模块ID不能为空")
+    private Long moduleId;
+
+
     @TableField(exist=false)
     private String productionResourceName;
 
     @Builder
-    public ResourceBusiness(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, String name, String status, String isFinal, String remark, Long resourceCodeId,Long resourceId) {
+    public ResourceBusiness(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, String name, String status, String isFinal, String remark, Long moduleId,Long resourceId) {
         super(id, createTime, createUser, updateTime, updateUser);
         this.name = name;
         this.status = status;
         this.isFinal = isFinal;
         this.remark = remark;
         this.resourceId = resourceId;
+        this.moduleId = moduleId;
         this.createTime = createTime;
         this.createUser = createUser;
         this.updateTime = updateTime;

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/DictionaryType.java

@@ -153,8 +153,13 @@ public class DictionaryType {
      */
     public static final String BUSINESS_PRODUCT_TYPE = "BUSINESS_PRODUCT_TYPE";
 
+    /**
+     *  托盘类型分类
+     */
+    public static final String TRAY_CATEGORY_TYPE = "TRAY_CATEGORY_TYPE";
+
     public static final String[] ALL = new String[]{
-            EDUCATION, NATION, POSITION_STATUS, AREA_LEVEL,RESOURCES_TYPE,RESOURCES_CATEGORY,MODEL_CATEGORY,MODEL_NODE_TYPE,MODEL_NET_MODE,MODEL_JOIN_AGREEMENT, BUSINESS_PRODUCT_TYPE,
+            EDUCATION, NATION, POSITION_STATUS, AREA_LEVEL,RESOURCES_TYPE,RESOURCES_CATEGORY,MODEL_CATEGORY,MODEL_NODE_TYPE,MODEL_NET_MODE,MODEL_JOIN_AGREEMENT, BUSINESS_PRODUCT_TYPE,TRAY_CATEGORY_TYPE,
             DATA_TYPE,COMPANY,OPERATOR,ISSUE_INSTRUCTIONS,PRESCRIPTION,INTERFACE_MODULE_TYPE,METERIAL_CATEGORY,METERIAL_BRAND,FREQUENCY,MONITOR_WAY, IGEN_PROJECT_STATUS,INTERFACE_TYPE,CUTTING_TOOL_TYPE,MODEL_CNC_SYSTEM
     };