feature 代码提交

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

@@ -304,6 +304,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         // 更新坯料计划的生产状态为已发布
         boolean bool2 = this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankOrderId)
+                        .set(ApsBlankOrderDo::getDeliverydate,deliveryDate)
                 .set(ApsBlankOrderDo::getLockmark, LOCKMARK_N));
 
         // 解锁订单所有作业状态=待开工的作业明细（是否锁定=否）

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -124,7 +124,9 @@
             <set>
                 LOCKMARK='n',
                 PRODUCTSTATUS='10',
-                SCHEDULINGSTATUS='10'
+                SCHEDULINGSTATUS='10',
+                SCHEDULEDATESTART=null,
+                SCHEDULEDATEEND=null
             </set>
             <where>
                 DELETED='0'

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -150,7 +150,7 @@
         a1.PROCESSWORKSHOP,
         a1.PROCESSDEVICEID,
         a1.PROCESSDEVICE,
-        DATE(a6.DELIVERYDATE) AS DELIVERYDATE,
+        DATE(a3.DELIVERYDATE) AS DELIVERYDATE,
         a2.PROCESSNAME,
         a1.STARTINGROLL,
         a1.REPORTROLL,