feature 代码提交

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1261,18 +1261,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 清空作业明细
         processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                 .in(ApsProcessOperationProcessEquDo::getBlankid, blankids));
-        // 更新订单的排程状态
-        List<ApsProductionOrderDo> productionOrderDos = new ArrayList<>();
-        for (String apsProductionOrderId : apsProductionOrderIds) {
-            ApsProductionOrderDo productionOrderDo = new ApsProductionOrderDo();
-            productionOrderDo.setId(apsProductionOrderId);
-//            productionOrderDo.setSchedulstatus(SaveConstans.SchedulstatusTyep.SCHEDULSTATUS_TOSCHEDULE);
-            productionOrderDo.setScheduledeliverydate(null);
-            productionOrderDo.setProductionstatus(TO_BE_SCHEDULED);
-            productionOrderDos.add(productionOrderDo);
-        }
         // 更新生产订单的状态
-        apsProductionOrderService.updateBatchById(productionOrderDos);
+        apsProductionOrderService.update(new LambdaUpdateWrapper<ApsProductionOrderDo>()
+                .in(ApsProductionOrderDo::getId,apsProductionOrderIds)
+                .set(ApsProductionOrderDo::getScheduledeliverydate, null)
+                .set(ApsProductionOrderDo::getProductionstatus,TO_BE_SCHEDULED));
         // 更新坯料计划的状态
         this.baseMapper.cancelSchedulingUpdate(blankids);
         //获取坯料计划用到的产品明细ID

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -203,11 +203,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         }
         /***************************存在不合格批次信息时 更新更新报工记录对应订单的订单评审状态=待计划评审， 订单调整日期=今天*************************************/
         if (unqualifiedQuantity > 0) {
-            apsProductionOrderService.update(new LambdaUpdateWrapper<ApsProductionOrderDo>()
-                    .eq(ApsProductionOrderDo::getId, productionOrderDo.getId())
-                    .set(ApsProductionOrderDo::getChangedate, new Date())
-                    .set(ApsProductionOrderDo::getAuditstatus, PENDING_PLAN_REVIEW)
-            );
+            apsProductionOrderService.getBaseMapper().changeOrderById(productionOrderDo.getId());
         }
         /************************更新工序*******************************/
         // 更新工序作业明细表的输出已检验卷数，不合格卷数，合格卷数完工状态,作业状态,生产状态

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderDo.java

@@ -149,7 +149,6 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
     /**
      * 排程交货日期
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date scheduledeliverydate;
 
     /**