后台功能处理

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ToolController.java

@@ -6,15 +6,21 @@ import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.controller.operationManagementCenter.ToolbarController;
+import com.github.zuihou.business.edgeLibrary.entity.Storge;
+import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.productionReadyCenter.entity.MachineCuttingTool;
 import com.github.zuihou.business.productionReadyCenter.service.MachineCuttingToolService;
 import com.github.zuihou.business.productionResourceCenter.dto.ToolPageDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.ToolSaveDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.ToolUpdateDTO;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.Tool;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourceBizService;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.business.productionResourceCenter.service.ToolService;
+import com.github.zuihou.business.util.MsgUtil;
+import com.github.zuihou.common.constant.DictionaryKey;
 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;
@@ -61,6 +67,15 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     @Autowired
     private ToolbarController toolbarController;
 
+    @Autowired
+    private ProductionresourcePositionService productionresourcePositionService;
+
+    @Autowired
+    private StorgeService storgeService;
+
+    @Autowired
+    private MsgUtil msgUtil;
+
     @Override
     public void query(PageParams<ToolPageDTO> params, IPage<Tool> page, Long defSize) {
         ToolPageDTO data = params.getModel();
@@ -96,7 +111,7 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     }
 
     //刀具定时任务处理
-    @Scheduled(cron = "0 0/2 * * * *")
+    //@Scheduled(cron = "0 0/2 * * * *")
     @ApiOperation(value = "同步刀具", notes = "同步刀具")
     @PostMapping("/synchronousTool")
     public R<Boolean> synchronousTool() throws Exception {
@@ -107,22 +122,41 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
         //同步更新处理
         List<MachineCuttingTool> cutToolList = machineCuttingToolService.sysCuttingTools(machineCuttingTool);
 
+        String zoneName = "涡轴柔性加工单元";
+        List<ProductionresourcePosition> xbkList = productionresourcePositionService.getFreeProductionresourcePositionByNos(DictionaryKey.YJ_ZONE_XBK.get(zoneName+"-tool").split(","));
+        if(xbkList.size()==0 || xbkList.size() < cutToolList.size()) {
+            msgUtil.createWarnLog("刀具线边库条件不满足", "DataException");
+            return R.fail("刀具线边库条件不满足");
+        }
+
         if(cutToolList.size()>0){
-            cutToolList.stream().filter(item->{
+            for(int i=0;i<cutToolList.size(); i++) {
+                MachineCuttingTool item = cutToolList.get(i);
+                //默认取刀具去刀架
+                boolean isWarn = false;
                 //同步添加天轨处理订单
-                Map<String,String> data = Maps.newHashMap();
-                data.put("start","CT_"+);
-                data.put("goalType","");
-                data.put("goal","");
-                data.put("goal","");
+                Map<String, String> data = Maps.newHashMap();
+                //获取机床待取库位
+                ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, item.getMachineId()).like(ProductionresourcePosition::getPointId, "CNC0").last("LIMIT 1"));
+                data.put("start", "CT_" + productionresourcePosition.getPointId());
+                if (isWarn) {
+                    List<ProductionresourcePosition> cutToolStationList = productionresourcePositionService.list(new LbqWrapper<ProductionresourcePosition>().like(ProductionresourcePosition::getPointId, "LAUPT"));
+                    ProductionresourcePosition cutToolStation = cutToolStationList.get(i);
+                    Productionresource productionresource = productionresourceBizService.getById(cutToolStation.getResourceId());
+                    data.put("goalType", productionresource.getCode());
+                    data.put("goal", cutToolStation.getPointId());
+                } else {
+                    data.put("goalType", DictionaryKey.YJ_ZONE_XBK.get(zoneName + "-tool"));
+                    data.put("goal", xbkList.get(i).getPointId());
+                }
+
+                String cutPosition = item.getCuttingToolPosition().replace("1.", "");
+                data.put("cutStartNo", cutPosition);
                 toolbarController.addCutToolTask(data);
-            });
+                item.setStatus("1");
+                machineCuttingToolService.updateAllById(item);
+            }
         }
-
-
-
-
-
         return R.success();
     }