订单测试相关问题修改

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

@@ -29,7 +29,7 @@ public interface OrderService extends SuperService<Order> {
     IPage<Order> pageList(IPage page,String sustDesc, LbqWrapper<Order> wrapper);
 
 
-    Map<String,Object> oneTouchSchedule(Map<String,Object> map);
+    R oneTouchSchedule(Map<String,Object> map);
 
     Map<String,Object> advSchedule(Map<String,Object> map);
 
@@ -64,7 +64,7 @@ public interface OrderService extends SuperService<Order> {
     /**
      * 修改数据
      */
-    Order updateData(OrderUpdateDTO data);
+    R updateData(OrderUpdateDTO data);
 
     /**
      * 订单状态统计数

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

@@ -2,9 +2,11 @@ package com.github.zuihou.business.operationManagementCenter.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGAlterTableAlterColumnSetNotNull;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.DemoLine.DemoCacheKey;
@@ -257,10 +259,11 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Order updateData(OrderUpdateDTO data) {
-        Order bean = BeanPlusUtil.toBean(data, Order.class);
-        updateById(bean);
-        return bean;
+    public R updateData(OrderUpdateDTO data) {
+
+        Plan bean = BeanPlusUtil.toBean(data, Plan.class);
+        planMapper.updateById(bean);
+        return R.success();
     }
 
     @Override
@@ -321,7 +324,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
     }
 
     @Override
-    public Map<String,Object> oneTouchSchedule(Map<String,Object> map) {
+    public R oneTouchSchedule(Map<String,Object> map) {
         List<Map>list = new ArrayList<Map>();
         if(map!=null&&map.get("orderList")!=null){
             list = (List<Map>)map.get("orderList");
@@ -336,7 +339,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         if(obj==null){
             redisTemplate.opsForValue().set(RepeatCacheKey.ONETOUCHSCHEDULE_UNION_KEY+"_"+ids,"1",60,TimeUnit.SECONDS);
         }else{
-            return map;
+            return R.success();
         }
 
 
@@ -366,6 +369,18 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             List<Long> bomIdList = orderProductList.stream().map(p -> p.getBomId()).collect(Collectors.toList());
             //查出本次需要得工艺信息
             Map<Long, List<BomProcedure>> bomProcedureMap = bomProcedureService.getBomProcedureMap(bomIdList);
+
+            if(bomProcedureMap.size() == 0){
+                return R.fail("当前排产零件中存在未配置工艺路线，无法进行排产");
+            }else{
+                for(Long key : bomProcedureMap.keySet()){//keySet获取map集合key的集合  然后在遍历key即可
+                    List<BomProcedure> bomProcedures = bomProcedureMap.get(key);
+                    if(bomProcedures.size() == 0){
+                        return R.fail("当前排产零件中存在未配置工艺路线，无法进行排产");
+                    }
+                }
+            }
+
             //查出所有的计划产品
             List<PlanProduct> planProductList = planProductService.list(Wraps.<PlanProduct>lbQ().in(PlanProduct::getPlanId, planIdList));
             //生成任务
@@ -375,7 +390,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         }finally {
             redisTemplate.delete(RepeatCacheKey.ONETOUCHSCHEDULE_UNION_KEY+"_"+ids);
         }
-        return map;
+        return R.success();
     }
 
 

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

@@ -199,6 +199,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             Long bomId = planProduct.getBomId();
             List<BomProcedure> bomProcedureList = bomProcedureMap.get(bomId);
             Map<Long,BomProcedure> bpMap = bomProcedureList.stream().collect(Collectors.toMap(BomProcedure::getId, t->t));
+
+
             //产品批次号，用于产品分解任务关联
             String bomBatchNo = UUID.randomUUID().toString().replace("-", "");
 

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

@@ -292,13 +292,13 @@
     <update id="updatePlanStatus">
         UPDATE imcs_p_plan o
             SET o.status = '-1'
-            WHERE id =  #{planId}
+            WHERE id =  #{id}
     </update>
 
     <update id="updatePlanProduceStatus">
         UPDATE imcs_p_plan o
             SET o.produce_status = #{produceStatus}
-            WHERE id =  #{planId}
+            WHERE id =  #{id}
     </update>
 
 </mapper>

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

@@ -144,16 +144,14 @@ public class OrderController extends SuperController<OrderService, Long, Order,
 
     @ApiOperation(value = "更新优先级", notes = "更新优先级")
     @PostMapping("/updateData")
-    public R<Order> updateData(@RequestBody OrderUpdateDTO model) {
-        Order order = baseService.updateData(model);
-        return success(order);
+    public R updateData(@RequestBody OrderUpdateDTO model) {
+        return  baseService.updateData(model);
     }
 
     @ApiOperation(value = "一键排产", notes = "一键排产")
     @PostMapping("/oneTouchSchedule")
-    public R<Map<String,Object>> oneTouchSchedule(@RequestBody Map<String,Object> map) {
-        Map<String,Object> returnMap = baseService.oneTouchSchedule(map);
-        return success(returnMap);
+    public R oneTouchSchedule(@RequestBody Map<String,Object> map) {
+        return baseService.oneTouchSchedule(map);
     }
 
     @ApiOperation(value = "高级排产", notes = "高级排产")

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

@@ -76,7 +76,6 @@ public class PlanController extends SuperController<PlanService, Long, Plan, Pla
                 .eq(Plan::getOrderId,plan.getOrderId())
                 .eq(Plan::getDraftFlag,plan.getDraftFlag())
                 .eq(Plan::getPlanStatus,plan.getPlanStatus())
-                .orderByDesc(Plan::getPrority)
                 .orderByDesc(Plan::getCreateTime);