Merge remote-tracking branch 'origin/master'

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

@@ -581,6 +581,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         updateBlank.setId(order.getId());
                         updateBlank.setSchedulingstatus(TO_BE_PUBLISHED);
                         updateBlank.setScheduledateend(endDate);
+                        updateBlank.setPromisedateend(endDate);
                         blankIds.add(updateBlank);
                         if (orderDeliveryTime.containsKey(blankOrder.getProductionorderid())) {
                             // 对比取最大值
@@ -1366,7 +1367,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             productDetailDoList.add(apsProductDetailDo);
         }
         // 更新坯料计划产品明细的的生产状态
-        apsProductDetailService.updateBatchById(productDetailDoList);
+        if (productDetailDoList.size() > 0) {
+            apsProductDetailService.updateBatchById(productDetailDoList);
+        }
 //        apsProductDetailDao.updateProductstatus(apsProductionOrderIds);
     }
 

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

@@ -177,5 +177,20 @@ public class ApsProcessOutputProductDo extends BaseDo {
      */
     private BigDecimal rolloutputdiameter;
 
+    /**
+     * 卷重要求
+     */
+    private String rollweightrequirement;
+
+    /**
+     * 卷径要求
+     */
+    private String rolldiameterrequirement;
+
+    /**
+     * 卷数要求
+     */
+    private String rollnumberrequirement;
+
     private static final long serialVersionUID = 1L;
 }