修改功能Bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/OrderMapper.java

@@ -28,7 +28,7 @@ public interface OrderMapper extends SuperMapper<Order> {
     IPage<Order> pageList(IPage page, @Param("custDesc")String custDesc, @Param(Constants.WRAPPER) Wrapper<Order> queryWrapper, DataScope dataScope);
 
 
-    Map<String,String> getOrderStatusCount();
+    Map<String,String> getOrderStatusCount(Map map);
 
     int updateproduceStatusFinish();
 

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

@@ -43,6 +43,7 @@ import com.github.zuihou.business.productionResourceCenter.dao.ZZoneMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
 import com.github.zuihou.business.productionResourceCenter.service.RepairService;
+import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.business.util.DynamicRabbitMq;
 import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.common.constant.BizConstant;
@@ -57,6 +58,7 @@ import com.github.zuihou.security.model.SysUser;
 import com.github.zuihou.tenant.dao.ProductionresourceviewMapper;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.github.zuihou.utils.BeanPlusUtil;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
@@ -714,7 +716,9 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 
     @Override
     public Map<String,Integer> getOrderStatusCount(){
-        Map<String,String> map = baseMapper.getOrderStatusCount();
+        Map paramMap = Maps.newHashMap();
+        paramMap.put("orgIds", CommonUtil.getOrgIdsStr());
+        Map<String,String> map = baseMapper.getOrderStatusCount(paramMap);
         Map<String,Integer> entryMap = new HashMap<>();
         for(Map.Entry<String,String> entry: map.entrySet()){
             Object object = entry.getValue();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/CuttingToolMapper.java

@@ -22,5 +22,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface CuttingToolMapper extends SuperMapper<CuttingTool> {
 
-    IPage<CuttingTool> findPage(IPage<CuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<CuttingTool> wrapper, DataScope dataScope);
+    IPage<CuttingTool> findPage(IPage<CuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<CuttingTool> wrapper);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MachineCuttingToolMapper.java

@@ -22,5 +22,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface MachineCuttingToolMapper extends SuperMapper<MachineCuttingTool> {
 
-    IPage<MachineCuttingTool> findPage(IPage<MachineCuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<MachineCuttingTool> wrapper, DataScope dataScope);
+    IPage<MachineCuttingTool> findPage(IPage<MachineCuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<MachineCuttingTool> wrapper);
 }

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

@@ -51,7 +51,7 @@ public class CuttingToolServiceImpl extends SuperCacheServiceImpl<CuttingToolMap
     @Override
     @InjectionResult
     public IPage<CuttingTool> findPage(IPage<CuttingTool> page, LbqWrapper<CuttingTool> wrapper) {
-        return baseMapper.findPage(page, wrapper, new DataScope());
+        return baseMapper.findPage(page, wrapper);
     }
 
     @Override

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

@@ -78,7 +78,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
     @Override
     @InjectionResult
     public IPage<MachineCuttingTool> findPage(IPage<MachineCuttingTool> page, LbqWrapper<MachineCuttingTool> wrapper) {
-        return baseMapper.findPage(page, wrapper, new DataScope());
+        return baseMapper.findPage(page, wrapper);
     }
 
     @Override

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

@@ -78,16 +78,25 @@
         0 as schedulingCount,
         0 as orderSuspendCount,
         0 as orderConductCount
-        from imcs_o_order
+        from imcs_o_order o
+        <if test="orgIds != null and orgIds != ''">
+            left join imcs_z_zone z on o.zone_id = z.id
+            where z.org_id in (${orgIds})
+        </if>
         union all
         select 0 as totalCount,
         0 as sourceCount,
         0 as auditCount,
-        ifnull(sum(case when scheduling_status ='0' then 1 else 0 end),0) as schedulingCount,
-        ifnull(sum(case when produce_status = '3' then 1 else 0 end),0) as orderSuspendCount,
-        ifnull(sum(case when produce_status = '2' then 1 else 0 end),0) as orderConductCount
-        from imcs_p_plan)a
-
+        ifnull(sum(case when p.scheduling_status ='0' then 1 else 0 end),0) as schedulingCount,
+        ifnull(sum(case when p.produce_status = '3' then 1 else 0 end),0) as orderSuspendCount,
+        ifnull(sum(case when p.produce_status = '2' and p.plan_status = '2'  then 1 else 0 end),0) as orderConductCount
+        from imcs_p_plan p
+        <if test="orgIds != null and orgIds != ''">
+		    left join imcs_o_order o on p.order_id = o.id
+		    left join imcs_z_zone z on o.zone_id = z.id
+            where z.org_id in (${orgIds})
+        </if>
+		)a
     </select>
 
     <select id="orderStatitcs" resultType="map">

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

@@ -19,14 +19,15 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_user,update_time,remark,
-        cutting_tool_name, cutting_tool_type, specifications, status,cutting_tool_picture,cutting_tool_install_picture,org_id
+        cutting_tool_name, cutting_tool_type, specifications, status,cutting_tool_picture,cutting_tool_install_picture,program_id
     </sql>
 
     <select id="findPage" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         FROM (
-            select t.*, z.org_id from imcs_cutting_tool t  left join imcs_z_zone z on locate(z.abbreviate, left(t.cutting_tool_name,2))
+            select t.*, p.program_id from imcs_cutting_tool t
+            left join imcs_b_bom_procedure_tool p on t.id = p.tool_id group by t.id
          ) s ${ew.customSqlSegment}
     </select>
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -90,7 +90,7 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
                 .eq(TTask::getDraftFlag,"0")
                .eq(TTask::getResourceId,data.getResourceId())
                 .in(TTask::getStatus,statusArr)
-                .orderByAsc(TTask::getExpectStartTime).orderByDesc(TTask::getPrority);
+                .orderByAsc(TTask::getExpectStartTime).orderByAsc(TTask::getPrority);
         IPage<TTask> ipage = baseService.pageList(page,task.getMulPlanStatus(), wrapper);
         List<TTask> list = ipage.getRecords();
         //处理执行对象，目前和生产资源是一样，后续加入人工序再做处理

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolController.java

@@ -2,6 +2,7 @@ package com.github.zuihou.business.controller.productionReadyCenter;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.zuihou.authority.dto.auth.UserPageDTO;
 import com.github.zuihou.authority.entity.core.Org;
 import com.github.zuihou.base.controller.SuperCacheController;
@@ -21,6 +22,7 @@ import com.github.zuihou.base.R;
 import com.github.zuihou.business.productionResourceCenter.dto.RepairSaveDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.RepairUpdateDTO;
 import com.github.zuihou.business.productionResourceCenter.entity.Repair;
+import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.model.RemoteData;
@@ -61,12 +63,22 @@ public class CuttingToolController extends SuperCacheController<CuttingToolServi
     @Override
     public void query(PageParams<CuttingToolPageDTO> params, IPage<CuttingTool> page, Long defSize) {
         CuttingToolPageDTO cuttingToolPage = params.getModel();
+        Map<String, String> map = params.getMap();
 
         QueryWrap<CuttingTool> wrap = handlerWrapper(null, params);
 
         LbqWrapper<CuttingTool> wrapper = wrap.lambda();
         wrapper.like(CuttingTool::getCuttingToolName, cuttingToolPage.getCuttingToolName())
                 .like(CuttingTool::getSpecifications, cuttingToolPage.getSpecifications());
+        //查询刀具是否已被占用
+        if(map.size()>0 && map.containsKey("state")){
+            wrapper.notInSql(CuttingTool::getId, "select tool_id from imcs_b_bom_procedure_tool");
+        }
+        //获取指定程序关联的刀具
+        if(map.size()>0 && map.containsKey("ids") && StringUtil.isNotEmpty(map.get("ids"))){
+            String[] ids = StringUtils.split(map.get("ids"), ",");
+            wrapper.or().in(CuttingTool::getId, ids);
+        }
         baseService.findPage(page, wrapper);
     }
 
@@ -83,4 +95,7 @@ public class CuttingToolController extends SuperCacheController<CuttingToolServi
         CuttingTool cuttingTool = baseService.update(model);
         return success(cuttingTool);
     }
+
+
+
 }

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

@@ -119,6 +119,13 @@ public class CuttingTool extends Entity<Long> {
     private String status;
 
 
+    /**
+     * 刀具关联程序Id
+     */
+    @ApiModelProperty(value = "具关联程序Id")
+    @TableField(exist = false)
+    private Long programId;
+
     @Builder
     public CuttingTool(Long id, Long createUser, LocalDateTime createTime, Long updateUser, LocalDateTime updateTime,
                     String cuttingToolName, RemoteData<String, String> cuttingToolType, String specifications, String status, String cuttingToolPicture,String cuttingToolInstallPicture) {