坯料计划添加期望交货天数(天)

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

@@ -40,14 +40,12 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.Collator;
-import java.text.SimpleDateFormat;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.service.impl.ApsProductionOrderServiceImpl.ERROR_MSG;
 import static com.rongwei.bscommon.sys.utils.ApsUtils.addNewConflictsDesc;
-import static com.rongwei.safecommon.utils.SaveConstans.DatePattern.DATE_PATTERN_YMDHMS;
 import static com.rongwei.safecommon.utils.SaveConstans.ForcedConflictsDescription.EXCEEDING_THE_PROMISED_DELIVERY_DEADLINE;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_N;
 import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_Y;
@@ -331,9 +329,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Transactional(rollbackFor = Exception.class)
     public R insertOrder(Map<String, Object> params) throws Exception {
         String blankOrderId = params.get("BLANKORDERID").toString();
-        String deliveryDateStr = params.get("DELIVERYDATE").toString();
-        SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN_YMDHMS);
-        Date deliveryDate = formatter.parse(deliveryDateStr);
+        String expecteddays = params.get("EXPECTEDDAYS").toString();
 
         //撤回发布该作业的坯料计划的排程结果
         publishCancel(Arrays.asList(blankOrderId));
@@ -349,9 +345,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 currentUser == null ? "" : currentUser.getId(),
                 currentUser == null ? "" : currentUser.getName());
 
-        // 保存坯料需求的期望交货期
+        // 保存坯料需求的期望交货天数(天)
         boolean bool1 = this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().eq(ApsBlankOrderDo::getId, blankOrderId)
-                .set(ApsBlankOrderDo::getDeliverydate, deliveryDate)
+                .set(ApsBlankOrderDo::getExpecteddays, Integer.parseInt(expecteddays))
                 .set(ApsBlankOrderDo::getLockmark, LOCKMARK_N));
 
         // 解锁该坯料计划所有作业明细，设置是否锁定=否

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

@@ -321,4 +321,10 @@ public class ApsBlankOrderDo extends BaseDo {
     @TableField(value = "UPDATEPROCESS")
     private String updateprocess;
 
+    /**
+     * 期望交货天数(天)
+     */
+    @TableField(value = "EXPECTEDDAYS")
+    private Integer expecteddays;
+
 }

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

@@ -237,4 +237,16 @@ public class ApsBlankOrderHistoryDo extends BaseDo {
      */
     @TableField(value = "BLANKCOMEFROM")
     private String blankcomefrom;
+
+    /**
+     * 是否要更新工序作业1-要 0-不需要
+     */
+    @TableField(value = "UPDATEPROCESS")
+    private String updateprocess;
+
+    /**
+     * 期望交货天数(天)
+     */
+    @TableField(value = "EXPECTEDDAYS")
+    private Integer expecteddays;
 }