生产交期问题处理

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

@@ -820,7 +820,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
     @Override
     public void editDeliveryPeriod(ProductionOrderDto dto) {
         this.update(q -> q
-                .eq(ProductionOrder::getContractId, dto.getId())
+                .eq(ProductionOrder::getContractId, dto.getContractId())
                 .set(ProductionOrder::getDeliveryPeriod, dto.getDeliveryPeriod())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -222,5 +222,10 @@ public class ContractVo extends Contract {
      */
     private BigDecimal unsettledAmount;
 
+    /**
+     * 生产交期
+     */
+    private BigDecimal prodDeliveryPeriod;
+
 }
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -28,7 +28,8 @@
                                     FROM contract_product cp
                                              JOIN production_order_detail pod ON pod.contract_detail_id = cp.id
                                     WHERE cp.contract_id = t1.id)
-                               , 0)                       AS settledAmount
+                               , 0)                       AS settledAmount,
+                           po.delivery_period             as prodDeliveryPeriod
                     FROM contract t1
                              left join customer c on t1.buy_corporation_id = c.id
                              left join sys_user us on c.user_id = us.user_id