自定义订单功能处理

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

@@ -16,7 +16,6 @@ import com.github.zuihou.business.cutterdata.utils.CutterFile;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
-import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolConfig;
 import com.github.zuihou.business.productionReadyCenter.service.CuttingToolService;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dao.ZZoneProductionresourceMapper;

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

@@ -162,7 +162,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                 machineCuttingTool.setDoc(doc);
                 baseMapper.insert(machineCuttingTool);
                 //刀具报警 调用天轨 目标去刀具上下料站
-                if(map.containsKey(resourceId) && (tl.equals("L") || doc.equals("HD"))){
+                if(!map.containsKey(resourceId) && (tl.equals("L") || doc.equals("HD"))){
                     map.put(resourceId, machineCuttingTool);
                 }
             }

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

@@ -1459,9 +1459,10 @@ public class RobotNodeServiceImpl2 implements NodeOperationService {
             boolean flag = robotList.size() == 1 && robotList.get(0).getPointId().equals(DemoLineConstant.DEMOLINE_RJQR_TOOL);
             //天轨机器人判断处理
             if(flag) return robotList.get(0);
+            /*
             if(CollectionUtil.isEmpty(flikustockInfos)){
                 return null;
-            }
+            } */
         }
 
         //设备不存在

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

@@ -2,8 +2,6 @@ package com.github.zuihou.business.controller.productionReadyCenter;
 
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperCacheController;
-import com.github.zuihou.business.productionReadyCenter.dto.CuttingToolUpdateDTO;
-import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolConfig;
 import com.github.zuihou.business.productionReadyCenter.service.CuttingToolConfigService;
 import io.swagger.annotations.Api;

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

@@ -3,6 +3,7 @@ package com.github.zuihou.business.controller.productionResourceCenter;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.zuihou.authority.dao.auth.StationUserLoginInfoMapper;
 import com.github.zuihou.authority.entity.auth.StationUserLoginInfo;
 import com.github.zuihou.authority.entity.common.DictionaryItem;
@@ -13,13 +14,8 @@ import com.github.zuihou.business.edgeLibrary.entity.Storge;
 import com.github.zuihou.business.edgeLibrary.service.StockInfoService;
 import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.operationManagementCenter.dto.OrderUpdateDTO;
-import com.github.zuihou.business.operationManagementCenter.entity.Order;
-import com.github.zuihou.business.operationManagementCenter.entity.OrderTask;
-import com.github.zuihou.business.operationManagementCenter.entity.Plan;
-import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
-import com.github.zuihou.business.operationManagementCenter.service.OrderService;
-import com.github.zuihou.business.operationManagementCenter.service.OrderTaskService;
-import com.github.zuihou.business.operationManagementCenter.service.PlanService;
+import com.github.zuihou.business.operationManagementCenter.entity.*;
+import com.github.zuihou.business.operationManagementCenter.service.*;
 import com.github.zuihou.business.productionReadyCenter.entity.BBom;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureMeterial;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
@@ -49,6 +45,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -96,6 +93,12 @@ public class StationUserController extends SuperController<StationUserService, L
     private ProductionresourcePositionService productionresourcePositionService;
     @Autowired
     private CodeRuleService codeRuleService;
+    @Autowired
+    private StorgeService storgeService;
+    @Autowired
+    private WorkpieceService workpieceService;
+    @Autowired
+    private TaskNodeService taskNodeService;
 
     @Autowired
     private BBomService bBomService;
@@ -324,7 +327,19 @@ public class StationUserController extends SuperController<StationUserService, L
         String start = model.containsKey("start")? model.get("start").toString() : null;
         String goal = model.containsKey("goal")? model.get("goal").toString() : null;
         if(StringUtil.isEmpty(start) || StringUtil.isEmpty(goal)) return R.fail("传参有误");
-        //目标位是刀具上下料站 则启用天轨线边库刀架支持
+
+        //原加工订单预处理（MQ消息和节点状态改完成）
+        String[] startNameCondition = start.split("_");
+        if(startNameCondition.length != 2 || StringUtils.isEmpty(startNameCondition[1])) return R.fail("传参有误");
+        Storge startStorge = storgeService.getOne(new LbqWrapper<Storge>().eq(Storge::getPointId, startNameCondition[1]));
+        if(null == startStorge) return R.fail("起始库位不存在");
+        List<TWorkpiece> tWorkpieceList = workpieceService.list(new LbqWrapper<TWorkpiece>().eq(TWorkpiece::getIsEnd, "0").eq(TWorkpiece::getPointId, startNameCondition[1]));
+        if(tWorkpieceList.size()>1) return R.fail("自定义任务已在执行中");
+        TWorkpiece tWorkpiece = tWorkpieceList.get(0);
+        UpdateWrapper<TaskNode> updateWrapper = new UpdateWrapper();
+        updateWrapper.lambda().set(TaskNode::getExeStatus, "3").eq(TaskNode::getExeStatus,"2").eq(TaskNode::getCompleteBatchNo, tWorkpiece.getCompleteBatchNo());
+        taskNodeService.update(null, updateWrapper);
+
         OrderTask orderTask = OrderTask.builder().orderId(order.getId())
                 .hasMaterial("0").isMachine("0").isXbk("1").start(model.get("start").toString()).goal(model.get("goal").toString())
                 .build();

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

@@ -21,6 +21,7 @@ import com.github.zuihou.business.productionResourceCenter.service.Productionres
 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.context.BaseContextHandler;
 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;
@@ -112,6 +113,7 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     @ApiOperation(value = "同步刀具", notes = "同步刀具")
     @PostMapping("/synchronousTool")
     public R<Boolean> synchronousTool() throws Exception {
+        BaseContextHandler.setTenant("000");
         List<Productionresource> dataList = productionresourceBizService.list(new LbqWrapper<Productionresource>().eq(Productionresource::getStatus, "1").ne(Productionresource::getOnlineStatus,"0").isNotNull(Productionresource::getModeSpecification));
         List<Long> ids = dataList.stream().map(Productionresource::getId).collect(Collectors.toList());
         MachineCuttingTool machineCuttingTool = new MachineCuttingTool();