Merge branch 'master' of http://106.14.142.95:3000/oyq28/imcs_331

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

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -479,7 +479,7 @@ public class TaskWorkNode {
                                 if(StringUtils.isNotEmpty(orderTask.getIsApply()) && orderTask.getIsMachine().equals("0")){
                                      CuttingToolApply cuttingToolApply = cuttingToolApplyService.getById(orderTask.getIsApply());
                                      cuttingToolApply.setProcessStatus("3");
-                                     cuttingToolApplyService.updateAllById(cuttingToolApply);
+                                     cuttingToolApplyService.updateById(cuttingToolApply);
                                 }
 
                                 //删除自定义订单内容

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

@@ -27,5 +27,5 @@ public interface CuttingToolApplyMapper extends SuperMapper<CuttingToolApply> {
 
     void markProcessStatus(CuttingToolApply cuttingToolApply);
 
-    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page,@Param(Constants.WRAPPER) QueryWrapper<CuttingToolApply> queryWrapper, DataScope dataScope);
+    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page,@Param(Constants.WRAPPER) LbqWrapper<CuttingToolApply> queryWrapper, DataScope dataScope);
 }

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

@@ -49,5 +49,5 @@ public interface CuttingToolApplyService extends SuperCacheService<CuttingToolAp
      */
     void markProcessStatus(CuttingToolApply cuttingToolApply);
 
-    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page, QueryWrapper<CuttingToolApply> queryWrapper);
+    IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page, LbqWrapper<CuttingToolApply> queryWrapper);
 }

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

@@ -76,7 +76,7 @@ public class CuttingToolApplyServiceImpl extends SuperCacheServiceImpl<CuttingTo
     }
 
     @Override
-    public IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page, QueryWrapper<CuttingToolApply> queryWrapper){
+    public IPage<CuttingToolApply> findPageByQueryWrapper(IPage<CuttingToolApply> page, LbqWrapper<CuttingToolApply> queryWrapper){
         return baseMapper.findPageByQueryWrapper(page, queryWrapper, new DataScope());
     }
 

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

@@ -83,8 +83,10 @@
             SELECT
                 icta.id,
                 icta.cutting_tool_name AS cuttingToolName,
-                icta.process_status AS processStatus,
+                icta.process_status,
                 icta.resource_id,
+                icta.create_time,
+                icta.cut_goal_no,
                 (case icta.process_status when '0' then '未处理' when '1' then '缺料' when '2' then '处理中' when '3' then '已处理' end) AS processStatusName,
                 icc.parts_no,
                 icc.procedure_no,

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

@@ -88,18 +88,18 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
 //                .like(CuttingToolApply::getPartName, cuttingToolApplyPage.getPartName());
 //        baseService.findPage(page, wrap);
 
-        QueryWrapper<CuttingToolApply> queryWrapper = new QueryWrapper<CuttingToolApply>();
+        LbqWrapper<CuttingToolApply> queryWrapper = new LbqWrapper<CuttingToolApply>();
         if(StringUtils.isNotBlank(cuttingToolApplyPage.getProcessStatus())){
-            queryWrapper.eq("processStatus", cuttingToolApplyPage.getProcessStatus());
+            queryWrapper.eq(CuttingToolApply::getProcessStatus, cuttingToolApplyPage.getProcessStatus());
         }
         if(StringUtils.isNotBlank(cuttingToolApplyPage.getPartsNo())){
-            queryWrapper.eq("partsNo", cuttingToolApplyPage.getPartsNo());
+            queryWrapper.eq(CuttingToolApply::getPartsNo, cuttingToolApplyPage.getPartsNo());
         }
         if(StringUtils.isNotBlank(cuttingToolApplyPage.getProductNo())){
-            queryWrapper.eq("productNo", cuttingToolApplyPage.getProductNo());
+            queryWrapper.eq(CuttingToolApply::getProductNo, cuttingToolApplyPage.getProductNo());
         }
         if(StringUtils.isNotBlank(cuttingToolApplyPage.getPartName())){
-            queryWrapper.eq("partName", cuttingToolApplyPage.getPartName());
+            queryWrapper.eq(CuttingToolApply::getPartName, cuttingToolApplyPage.getPartName());
         }
         baseService.findPageByQueryWrapper(page, queryWrapper);
 
@@ -121,12 +121,13 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
     }
 
 
-    //@Scheduled(cron = "0 0/2 * * * *")
+    @Scheduled(cron = "0 0/2 * * * *")
     @ApiOperation(value = "自动换刀", notes = "自动换刀")
     @PostMapping("/cuttingToolTask")
     public R<Boolean> cuttingToolTask() {
         BaseContextHandler.setTenant("0000");
-        List<CuttingToolApply> dataList = baseService.list(new LbqWrapper<CuttingToolApply>().eq(CuttingToolApply::getProcessStatus, "0").orderByAsc(CuttingToolApply::getCreateTime));
+        IPage<CuttingToolApply> page = new Page<CuttingToolApply>(1L, 100L);
+        List<CuttingToolApply> dataList = baseService.findPageByQueryWrapper(page, new LbqWrapper<CuttingToolApply>().eq(CuttingToolApply::getProcessStatus, "0").orderByAsc(CuttingToolApply::getCreateTime)).getRecords();
         Map<String, CuttingToolApply> currentMap = Maps.newHashMap();
         dataList.stream().forEach(item -> {
             String goalDeviceId = item.getResourceId();
@@ -149,7 +150,7 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
             }
             JSONObject params = new JSONObject();
             params.put("start", "CT_"+ item.getStart());
-            ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getPointId, item.getResourceId()).like(ProductionresourcePosition::getPointId, "CNCT").last("LIMIT 1"));
+            ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, item.getResourceId()).like(ProductionresourcePosition::getPointId, "CNCT").last("LIMIT 1"));
             params.put("goal", "CT_"+ productionresourcePosition.getPointId());
             //获取动态唯一刀位
             params.put("cutGoalNo", item.getCutGoalNo());
@@ -163,7 +164,7 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
 
             //更改申请状态
             item.setProcessStatus("2");
-            baseService.updateAllById(item);
+            baseService.updateById(item);
         });
         return R.success();
     }

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

@@ -33,8 +33,10 @@ import com.github.zuihou.business.productionResourceCenter.service.StationUserSe
 import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
+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.update.LbuWrapper;
 import com.github.zuihou.log.annotation.SysLog;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import io.swagger.annotations.Api;
@@ -261,7 +263,8 @@ public class StationUserController extends SuperController<StationUserService, L
 
     @ApiOperation(value = "新增刀具取放任务", notes = "新增刀具取放任务")
     @PostMapping("/addCutToolTask")
-    public R addCutToolTask(@RequestBody Map<String, Object> model) {
+    public R addCutToolTask(@RequestBody Map<String,Object> model) {
+        BaseContextHandler.setTenant("0000");
         BBom bom = bBomService.getOne(new LbqWrapper<BBom>().eq(BBom::getStatus, "1").orderByDesc(BBom::getCreateTime).last("limit 1"));
         Map<String, Object> params = new HashMap<String, Object>() {
             {
@@ -320,7 +323,8 @@ public class StationUserController extends SuperController<StationUserService, L
 
     @ApiOperation(value = "新增自定义订单任务", notes = "新增自定义订单任务")
     @PostMapping("/addOrderTask")
-    public R addOrderTask(@RequestBody Map<String, Object> model) {
+    public R addOrderTask(@RequestBody Map<String,Object> model) {
+        BaseContextHandler.setTenant("0000");
         BBom bom = bBomService.getOne(new LbqWrapper<BBom>().eq(BBom::getStatus, "1").orderByDesc(BBom::getCreateTime).last("limit 1"));
         Map<String, Object> params = new HashMap<String, Object>() {
             {