生产任务相关功能修改

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

@@ -148,8 +148,8 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
                 )
         );
 
-        //过滤未开始的订单
-        wrapper.eq("po", ProductionOrder::getProduceStatus, 0);
+        //过滤已投产的数据
+        wrapper.isNotNull("po.produce_time");
 
         //权限过滤：生产排程-子公司看自己，总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
@@ -208,13 +208,10 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         //生成待备料
         createMaterialPreparation(productionOrder);
 
-        Date date = new Date();
-        this.update(q -> q
-                .eq(ProductionOrder::getId, id)
-                .set(ProductionOrder::getProduceTime, date)
-                .set(ProductionOrder::getUpdateTime, date)
-                .set(ProductionOrder::getUpdateUser, SecurityUtils.getUserId())
-        );
+        productionOrder.setProduceStatus(1);
+        productionOrder.setProduceTime(new Date());
+
+        this.updateById(productionOrder);
     }
 
     /**

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

@@ -10,6 +10,7 @@ import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
 import com.fjhx.mes.entity.production.po.ProductionReportingDetail;
 import com.fjhx.mes.entity.production.po.ProductionTaskProgress;
@@ -17,6 +18,7 @@ import com.fjhx.mes.entity.production.vo.ProductionReportingDetailVo;
 import com.fjhx.mes.entity.technology.po.TechnologyProcessLine;
 import com.fjhx.mes.mapper.production.ProductionReportingDetailMapper;
 import com.fjhx.mes.service.production.ProduceOrderDetailService;
+import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.mes.service.production.ProductionReportingDetailService;
 import com.fjhx.mes.service.production.ProductionTaskProgressService;
 import com.fjhx.mes.service.technology.TechnologyProcessLineService;
@@ -51,6 +53,8 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
     private ProductInfoService productInfoService;
     @Autowired
     private TechnologyProcessLineService technologyProcessLineService;
+    @Autowired
+    private ProduceOrderService produceOrderService;
 
     @Override
     public Page<ProductionReportingDetailVo> getPage(ProductionReportingDetailSelectDto dto) {
@@ -125,6 +129,20 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
             }
             produceOrderDetailService.updateById(productionOrderDetail);
         }
+        //检查订单下的任务是否完成，更改状态
+        Long produceOrderId = productionOrderDetail.getProduceOrderId();
+        long count1 = produceOrderDetailService.count(q -> q
+                .eq(ProductionOrderDetail::getProduceOrderId, produceOrderId)
+                .ne(ProductionOrderDetail::getProduceStatus, 2)
+        );
+        if (count1 == 0) {
+            produceOrderService.update(q -> q
+                    .eq(BasePo::getId, produceOrderId)
+                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                    .set(BasePo::getUpdateTime, new Date())
+                    .set(ProductionOrder::getProduceStatus, 2)
+            );
+        }
 
         this.save(dto);
     }

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -19,8 +19,8 @@
 			   pod.del_flag,
 			   po.code        AS orderCode,
 			   po.create_time AS orderCreateTime,
-			   po.produce_time
-			po.delivery_period
+			   po.produce_time,
+			   po.delivery_period
 		FROM production_order_detail pod
 				 LEFT JOIN production_order po ON pod.produce_order_id = po.id
 			${ew.customSqlSegment}