aps-坯料计划保存时拼接字段 坯料计划工艺描述去除是否新料的判断字段

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

@@ -2642,11 +2642,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
         //订单的客户ID
         String customid = StringUtils.isNotBlank(apsProductionOrderDo.getCustomid()) ? apsProductionOrderDo.getCustomid() : "";
-        //是否新料
-        String isNewBlank = "否";
-        if ("新料".equals(apsBlankOrderDo.getBlankcomefrom())) {
-            isNewBlank = "是";
-        }
+//        //是否新料
+//        String isNewBlank = "否";
+//        if ("新料".equals(apsBlankOrderDo.getBlankcomefrom())) {
+//            isNewBlank = "是";
+//        }
         //排产车间
         String plannedproductionworkshop = StringUtils.isNotBlank(apsBlankOrderDo.getPlannedproductionworkshop()) ? apsBlankOrderDo.getPlannedproductionworkshop() : "";
         //工艺路线标签
@@ -2660,7 +2660,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         String prowidth = apsBlankOrderDo.getProwidth() != null ? CXCommonUtils.removeExtraZerosAndDecimal(apsBlankOrderDo.getProwidth()) : "";
 
         //坯料计划工艺描述
-        String endProcessDesc = String.join(",", Arrays.asList(customid, isNewBlank, plannedproductionworkshop, routetag, blanktype, producttype, alloy, alloystatus, thickness + "*" + prowidth, processDesc));
+        String endProcessDesc = String.join(",", Arrays.asList(customid, plannedproductionworkshop, routetag, blanktype, producttype, alloy, alloystatus, thickness + "*" + prowidth, processDesc));
         ApsBlankOrderDo needUpdate = new ApsBlankOrderDo();
         needUpdate.setId(apsBlankOrderDo.getId());
         needUpdate.setProcessdesc(endProcessDesc);
@@ -5710,11 +5710,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 }
                 //订单的客户ID
                 String customid = StringUtils.isNotBlank(apsProductionOrderDo.getCustomid()) ? apsProductionOrderDo.getCustomid() : "";
-                //是否新料
-                String isNewBlank = "否";
-                if ("新料".equals(apsBlankOrderDo.getBlankcomefrom())) {
-                    isNewBlank = "是";
-                }
+//                //是否新料
+//                String isNewBlank = "否";
+//                if ("新料".equals(apsBlankOrderDo.getBlankcomefrom())) {
+//                    isNewBlank = "是";
+//                }
                 //排产车间
                 String plannedproductionworkshop = StringUtils.isNotBlank(apsBlankOrderDo.getPlannedproductionworkshop()) ? apsBlankOrderDo.getPlannedproductionworkshop() : "";
                 //工艺路线标签
@@ -5728,7 +5728,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 String prowidth = apsBlankOrderDo.getProwidth() != null ? CXCommonUtils.removeExtraZerosAndDecimal(apsBlankOrderDo.getProwidth()) : "";
 
                 //坯料计划工艺描述
-                String endProcessDesc = String.join(",", Arrays.asList(customid, isNewBlank, plannedproductionworkshop, routetag, blanktype, producttype, alloy, alloystatus, thickness + "*" + prowidth, processDesc));
+                String endProcessDesc = String.join(",", Arrays.asList(customid, plannedproductionworkshop, routetag, blanktype, producttype, alloy, alloystatus, thickness + "*" + prowidth, processDesc));
                 ApsBlankOrderDo needUpdate = new ApsBlankOrderDo();
                 needUpdate.setId(apsBlankOrderDo.getId());
                 needUpdate.setProcessdesc(endProcessDesc);