生产排程添加按交期排序

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -110,6 +110,8 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             if (isRawMaterial.equals(1)) {
                 //过滤有配置原材料的产品
                 wrapper.isNotNull("pi.raw_material_id");
+                //同时过滤未配置工艺的的产品
+                wrapper.isNotNull("pi.technology_id");
             } else {
                 //过滤没原材料的产品
                 wrapper.isNull("pi.raw_material_id");

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -152,6 +152,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
 
         wrapper.groupBy("po.id");
         wrapper.orderByAsc("po", ProductionOrder::getDeliveryPeriod);
+        wrapper.orderByAsc("po", ProductionOrder::getCreateTime);
         wrapper.orderByAsc("po", ProductionOrder::getId);
         List<ProductionOrderVo> schedulingList = baseMapper.getSchedulingList(wrapper);
         return schedulingList;
@@ -247,7 +248,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         List<ProductionProcessesVo> processes = productionProcessesMapper.getProcessesByProductId(IWrapper.getWrapper().in("pi.id", productIds));
         Map<Long, List<ProductionProcessesVo>> processesMap = processes.stream().collect(Collectors.groupingBy(ProductionProcessesVo::getProductId));
         for (ProductionOrderDetail productionOrderDetail : productionOrderDetailList) {
-            List<ProductionProcessesVo> productionProcessesVos = processesMap.get(productionOrderDetail.getProductId());
+            List<ProductionProcessesVo> productionProcessesVos = processesMap.getOrDefault(productionOrderDetail.getProductId(), new ArrayList<>());
             for (ProductionProcessesVo productionProcessesVo : productionProcessesVos) {
                 ProductionTaskProgress prodTaskProgress = new ProductionTaskProgress();
                 prodTaskProgress.setTaskId(productionOrderDetail.getId());