生产订单添加是否逾期

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderSelectDto.java

@@ -49,4 +49,9 @@ public class ProduceOrderSelectDto extends BaseSelectDto {
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	private Date produceTime;
 
+	/**
+	 * 是否逾期
+	 */
+	private Integer isOverdue;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrder.java

@@ -59,4 +59,9 @@ public class ProductionOrder extends BasePo {
      */
     private Date produceTime;
 
+    /**
+     * 王工时间
+     */
+    private Date finishTime;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -33,4 +33,9 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private String companyName;
 
+    /**
+     * 是否逾期
+     */
+    private Integer isOverdue;
+
 }

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

@@ -26,7 +26,7 @@ public interface ProduceOrderService extends BaseService<ProductionOrder> {
     Page<ProductionOrderVo> getPage(ProduceOrderSelectDto dto);
 
     /**
-     * 生产订单新增
+     * 下发生产
      */
     void createOrder(ProductionOrderDto produceOrderDto);
 

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

@@ -124,6 +124,11 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
             wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
         }
 
+        //是否逾期过滤
+        if (ObjectUtil.isNotEmpty(dto.getIsOverdue())) {
+            wrapper.eq("IF(IFNULL(po.finish_time,NOW())>po.delivery_period,1,0)", dto.getIsOverdue());
+        }
+
         Page<ProductionOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

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

@@ -148,11 +148,13 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
 
         Assert.notEmpty(productionTaskProgress, "查询不到生产进度信息");
 
+        Date newDateTime = new Date();
+
         //更新生产进度信息
         productionTaskProgressService.update(q -> q
                 .eq(ProductionTaskProgress::getId, productionTaskId)
                 .setSql("finish_quantity = finish_quantity + " + dto.getQuantity())
-                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateTime, newDateTime)
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
 
@@ -177,7 +179,7 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
             productionOrderDetail.setFinishQuantity(add);
             //全部完成赋值完工时间
             if (add.compareTo(quantity) >= 0) {
-                productionOrderDetail.setFinishTime(new Date());
+                productionOrderDetail.setFinishTime(newDateTime);
                 productionOrderDetail.setProduceStatus(2);
             }
             produceOrderDetailService.updateById(productionOrderDetail);
@@ -192,8 +194,9 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
             produceOrderService.update(q -> q
                     .eq(BasePo::getId, produceOrderId)
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-                    .set(BasePo::getUpdateTime, new Date())
+                    .set(BasePo::getUpdateTime, newDateTime)
                     .set(ProductionOrder::getProduceStatus, 2)
+                    .set(ProductionOrder::getFinishTime, newDateTime)
             );
         }
 

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

@@ -13,7 +13,9 @@
 			   po.update_user,
 			   po.update_time,
 			   po.company_id,
-			   c.prod_tag
+			   c.prod_tag,
+			   po.finish_time,
+			   (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue
 		from production_order po
 				 LEFT JOIN contract c ON po.contract_id = c.id
 			${ew.customSqlSegment}

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -224,7 +224,6 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
         ObsFileUtil.exchangeBusinessId(oldContractId, businessId);
 
-        throw new ServiceException("111111111111111111");
     }
 
     void editAvailableStock(Contract oldContract, Long oldContractId, Long businessId) {