后台业务代码更新

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
@@ -689,6 +690,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         try {
             returnData = restTemplate.postForObject(processInfo.get("hostSyetemTaskUrl").toString(), formEntity, String.class);
             returnDataObject = JSONObject.parseObject(returnData);
+            //returnDataObject.put("result", "true");
             log.error("调用上位机执行指令返回" + returnData);
             if("true".equals(returnDataObject.get("result"))){
                 // 放入redis，方便回调的时候判断是否是最后一个结点，如果是最后一个结点不在做任何逻辑，更新相应的库位信息
@@ -854,14 +856,15 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
 
     @Override
     public Boolean riseUp(Map map) {
-        long preId = Long.parseLong(map.get("preId").toString());
+        int sort = Integer.parseInt(map.get("sort").toString());
         long orderId = Long.parseLong(map.get("orderId").toString());
         long currentId = Long.parseLong(map.get("currentId").toString());
-        int procedureOrder = tTaskMapper.selectOne(new LbqWrapper<TTask>().select(TTask::getProcedureOrder).eq(TTask::getProcedureId, preId).eq(TTask::getOrderId, orderId).orderByDesc(TTask::getProcedureOrder).last("limit 1")).getProcedureOrder();
-        List<Long> ids = tTaskMapper.selectList(new LbqWrapper<TTask>().eq(TTask::getProcedureId, currentId).eq(TTask::getOrderId, orderId).orderByDesc(TTask::getProcedureOrder)).stream().mapToLong(TTask::getId).boxed().collect(Collectors.toList());
-        UpdateWrapper<TTask> updateWrapper = new UpdateWrapper<TTask>();
-        updateWrapper.lambda().in(TTask::getId, ids).set(TTask::getProcedureOrder, ++procedureOrder);
-        return tTaskMapper.update(null, updateWrapper) > 0 ? true : false;
+        int procedureOrder = tTaskMapper.selectOne(new LbqWrapper<TTask>().select(TTask::getProcedureOrder).in(TTask::getStatus, Arrays.asList("1","2")).eq(TTask::getOrderId, orderId).orderByDesc(TTask::getProcedureOrder).last("limit 1")).getProcedureOrder();
+        //获取当前零件下一序列的id值
+        List<Long> ids = tTaskMapper.selectList(new LbqWrapper<TTask>().eq(TTask::getProcedureSort, ++sort).eq(TTask::getOrderId, orderId).in(TTask::getStatus, Arrays.asList("1","2")).orderByDesc(TTask::getProcedureOrder)).stream().mapToLong(TTask::getId).boxed().collect(Collectors.toList());
+        LambdaUpdateWrapper<TTask> updateWrapper = new LambdaUpdateWrapper<TTask>();
+        updateWrapper.in(TTask::getId, ids).set(TTask::getProcedureOrder, ++procedureOrder).set(TTask::getUpdateTime, new Date());
+        return tTaskMapper.update(null, updateWrapper) > 0;
     }
 
     /**

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

@@ -790,9 +790,11 @@ public class RobotNodeServiceImpl implements NodeOperationService {
 
                         Map locationMap = new HashMap();
 
-                        Productionresource productionresource =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
-                        if(productionresource.getModeSpecification().contains("HELLER")){
-                            locationMap.put("fileName","3");
+                        if(taskNode.getTargetResourceId() !=null){
+                            Productionresource productionresource =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
+                            if(!Objects.isNull(productionresource) && StringUtil.isNotEmpty(productionresource.getModeSpecification()) && productionresource.getModeSpecification().contains("HELLER")){
+                                locationMap.put("fileName","3");
+                            }
                         }
 
                         locationMap.put("location",targetStorge.getPointId());

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

@@ -97,9 +97,9 @@
 
     <select id="workpieceStatistics" resultType="map">
         select * from (
-                          select count(DISTINCT w.complete_batch_no) as cnt, t.procedure_no, t.procedure_name, max(t.procedure_order) as procedure_order, t.procedure_id as id from imcs_t_workpiece w
-                          left join imcs_t_task t on w.procedure_id = t.procedure_id
-                          where w.order_id = #{orderId} and w.is_end = '0' and t.procedure_no is not null
+                          select count(DISTINCT w.complete_batch_no) as cnt, t.procedure_no, t.procedure_name, max(t.procedure_order) as procedure_order, t.procedure_id as id, t.procedure_sort from imcs_t_workpiece w
+                          left join imcs_t_task t on w.complete_batch_no = t.complete_batch_no
+                          where w.order_id = #{orderId} and w.is_end = '0' and t.procedure_no is not null and t.status='2'
                           group by t.procedure_no order by procedure_order desc, t.procedure_sort asc ) s LIMIT 10
     </select>
 

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

@@ -301,10 +301,10 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
     @ApiOperation(value = "排序上升", notes = "排序上升")
     @PostMapping("/riseUp")
     public R<Boolean> riseUp(@RequestBody Map map) {
-        Long index = map.containsKey("preId") && StringUtil.isNotEmpty(map.get("preId").toString())? Long.parseLong(map.get("preId").toString()): null;
+        Integer sort = map.containsKey("sort") && StringUtil.isNotEmpty(map.get("sort").toString())? Integer.parseInt(map.get("sort").toString()): null;
         Long currentId = map.containsKey("currentId") && StringUtil.isNotEmpty(map.get("currentId").toString())? Long.parseLong(map.get("currentId").toString()): null;
         Long orderId = map.containsKey("orderId") && StringUtil.isNotEmpty(map.get("orderId").toString())? Long.parseLong(map.get("orderId").toString()): null;
-        if(index==null || currentId==null || orderId==null) return R.fail("传参有误");
+        if(sort==null || currentId==null || orderId==null) return R.fail("传参有误");
         Boolean bool = baseService.riseUp(map);
         return bool? R.success(true):R.fail("");
     }