刀具后台功能处理

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

@@ -289,7 +289,7 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
                 if(freeCount > 0){
                     List<String> finalRealToolId = realToolId;
                     List<String> differenceCategory = toolId.stream()
-                            .filter(id -> !finalRealToolId.contains(id))
+                            .filter(id -> !finalRealToolId.contains(id)).distinct()
                             .collect(Collectors.toList());
                     List<CutterCategories> cutterCategories = cutterCategoriesService.list(new LbqWrapper<CutterCategories>().in(CutterCategories::getCutterT, differenceCategory)).stream().collect(Collectors.toList());
                     //List<String> dicName = dictionaryMapper.getDicName(toolId);

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

@@ -113,29 +113,32 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
             //缺刀集合
             applyChangeToolDetailDto.setCentralToolTypeList(vo.getList());
             applyChangeToolDetailDtoList.add(applyChangeToolDetailDto);
-            */
-            // 给刀具分配的刀加号
-            String cutGoalNo = this.getCutGoalNo(vo.getId().toString());
-            if(null == cutGoalNo){
-                msgUtil.createWarnLog("机床刀具目标位为空","DataException");
-                return;
-            }
+
+
             int count = cuttingToolApplyService.count(new LbqWrapper<CuttingToolApply>().eq(CuttingToolApply::getPlanId, vo.getPlanId()));
             if(count>0){
                 msgUtil.createWarnLog("订单校验申请已经存在，请勿重复提交","DataException");
                 return;
             }
+             */
+
             Plan plan = planService.getById(vo.getPlanId().toString());
-            CuttingToolApply cuttingToolApply = CuttingToolApply.builder()
-                    .planId(vo.getPlanId().toString()).resourceId(vo.getId().toString())
-                    .processStatus("0").produceId(plan.getOrderId().toString()).cutGoalNo(cutGoalNo)
-                    .build();
             List<CuttingTool> cuttingToolList = cuttingToolService.list(new LbqWrapper<CuttingTool>().in(CuttingTool::getCuttingToolNo, vo.getList()));
             cuttingToolList.stream().forEach(Obj->{
+                // 给刀具分配的刀加号
+                String cutGoalNo = this.getCutGoalNo(vo.getId().toString());
+                if(null == cutGoalNo){
+                    return;
+                }
+                CuttingToolApply cuttingToolApply = CuttingToolApply.builder()
+                        .planId(vo.getPlanId().toString()).resourceId(vo.getId().toString())
+                        .processStatus("0").produceId(plan.getOrderId().toString()).cutGoalNo(cutGoalNo)
+                        .build();
                 cuttingToolApply.setCuttingToolName(Obj.getCuttingToolName()).setCuttingToolNo(Obj.getCuttingToolNo().toString());
                 dataList.add(cuttingToolApply);
             });
         });
+        if(dataList.size()==0) return R.fail("机床刀具目标位为空");
         cuttingToolApplyService.saveBatch(dataList);
         //applyChangeToolDto.setApplyChangeToolDetailDtoList(applyChangeToolDetailDtoList);
         //return toolTaskNodeService.applyChangeTool(applyChangeToolDto);

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

@@ -12,9 +12,12 @@ import com.github.zuihou.business.operationManagementCenter.service.ToolTaskServ
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolApply;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.log.annotation.SysLog;
+import com.github.zuihou.sms.entity.SmsTemplate;
+import com.github.zuihou.tenant.dto.ProtocolSaveDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperCacheController;
 import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.centralToolMagazine.dto.ToolCheckDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.service.OrderService;
 import com.github.zuihou.business.productionReadyCenter.dto.*;
@@ -22,8 +23,10 @@ import com.github.zuihou.business.productionResourceCenter.service.Productionres
 import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.common.constant.ParameterKey;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import com.github.zuihou.sms.entity.SmsTemplate;
 import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -120,6 +123,11 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
         return success(cuttingToolApply);
     }
 
+    @RequestMapping("/checkToolTask")
+    public R<Boolean> checkToolTask(@RequestBody CuttingToolApplySaveDTO model) {
+        int count = baseService.count(Wraps.<CuttingToolApply>lbQ().eq(CuttingToolApply::getPlanId, model.getPlanId()));
+        return success(count > 0);
+    }
 
     @Scheduled(cron = "0 0/2 * * * *")
     @ApiOperation(value = "自动换刀", notes = "自动换刀")