refactor: 料单“是否考虑管线号”，忽略管线号的同时，同样忽略隔热代号

src/main/java/com/vverp/constant/MaterialOrderItemConsts.java

@@ -4,7 +4,7 @@ import org.apache.commons.lang3.BooleanUtils;
 
 public class MaterialOrderItemConsts {
 
-    // 根据当前阶段的是否考虑管线号，返回之前阶段的管线号
+    // 根据当前阶段的是否考虑管线号、隔热代号，返回之前阶段的管线号
     public static String getPrevStageLineAccount(Boolean ignoreLineAccount, String prevStageLineAccount) {
         return BooleanUtils.isTrue(ignoreLineAccount) ? "-" : prevStageLineAccount;
     }

src/main/java/com/vverp/controller/admin/MaterialOrderController.java

@@ -481,7 +481,7 @@ public class MaterialOrderController extends BaseController {
                 return RespData.error("阶段不能为空");
             }
             if (ignoreLineAccount == null) {
-                return RespData.error("是否考虑管线号不能为空");
+                return RespData.error("是否考虑管线号隔热代号不能为空");
             }
         }
         //获得文件名

src/main/java/com/vverp/entity/MaterialOrder.java

@@ -131,7 +131,7 @@ public class MaterialOrder extends OrderBase{
     /** 是否创建订货单 */
     private Boolean hasPurchaseOrder;
 
-    /** 匹配忽略管线号 */
+    /** 匹配忽略管线号、隔热代号 */
     private Boolean ignoreLineAccount;
 
     public String getName() {

src/main/java/com/vverp/service/MaterialOrderService.java

@@ -672,7 +672,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                             +"_"+diameterLStr+"_"+wallThicknessSStr+"_"+materialOrderItem.getShortDescription()
                             +"_"+wallThicknessLStr+"_"+materialOrderItem.getMaterial()
                             +"_"+materialOrderItem.getMemo()+"_"+materialOrderItem.getSize()
-                            +"_"+materialOrderItem.getSpecialRequest()+"_"+materialOrderItem.getInsulationCode()
+                            +"_"+materialOrderItem.getSpecialRequest()+"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(ignoreLineAccount, materialOrderItem.getInsulationCode())
                             +"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(ignoreLineAccount, materialOrderItem.getLineAccount()) +"_"+materialOrderItem.getAreaAccount()
                             +"_"+materialOrderItem.getSiteAccount()+"_"+materialOrderItem.getUnitAccount()
                             +"_"+materialOrderItem.getProductCode()+"_"+materialOrderItem.getPurchaseCode()
@@ -896,7 +896,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                             String endFace = ExcelUtil2.getCellValue(row.getCell(27));
                             String materialType = ExcelUtil2.getCellValue(row.getCell(28));
                             String material = ExcelUtil2.getCellValue(row.getCell(29));
-                            String insulationCode = ExcelUtil2.getCellValue(row.getCell(30));
+                            String insulationCode = BooleanUtils.isTrue(ignoreLineAccount) ? "-" : ExcelUtil2.getCellValue(row.getCell(30));
                             String specialRequest = ExcelUtil2.getCellValue(row.getCell(31));
                             String memo = ExcelUtil2.getCellValue(row.getCell(32));
                             String jacketSpec = ExcelUtil2.getCellValue(row.getCell(33));
@@ -1239,7 +1239,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                         +"_"+diameterLStr+"_"+wallThicknessSStr+"_"+prevItem.getShortDescription()
                         +"_"+wallThicknessLStr+"_"+prevItem.getMaterial()
                         +"_"+prevItem.getMemo()+"_"+prevItem.getSize()
-                        +"_"+prevItem.getSpecialRequest()+"_"+prevItem.getInsulationCode()
+                        +"_"+prevItem.getSpecialRequest()+"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), prevItem.getInsulationCode())
                         +"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), prevItem.getLineAccount()) +"_"+prevItem.getAreaAccount()
                         +"_"+prevItem.getSiteAccount()+"_"+prevItem.getUnitAccount()
                         +"_"+prevItem.getProductCode()+"_"+prevItem.getPurchaseCode()
@@ -1269,7 +1269,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                     +"_"+diameterLStr+"_"+wallThicknessSStr+"_"+item.getShortDescription()
                     +"_"+wallThicknessLStr+"_"+item.getMaterial()
                     +"_"+item.getMemo()+"_"+item.getSize()
-                    +"_"+item.getSpecialRequest()+"_"+item.getInsulationCode()
+                    +"_"+item.getSpecialRequest()+"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), item.getInsulationCode())
                     +"_"+ MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), item.getLineAccount()) +"_"+item.getAreaAccount()
                     +"_"+item.getSiteAccount()+"_"+item.getUnitAccount()
                     +"_"+item.getProductCode()+"_"+item.getPurchaseCode()
@@ -1369,7 +1369,7 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
             materialOrderItem.setPressureLevel(entry.getValue().getPressureLevel());
             materialOrderItem.setEndFace(entry.getValue().getEndFace());
             materialOrderItem.setMaterial(entry.getValue().getMaterial());
-            materialOrderItem.setInsulationCode(entry.getValue().getInsulationCode());
+            materialOrderItem.setInsulationCode(MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), entry.getValue().getInsulationCode()));
             materialOrderItem.setSpecialRequest(entry.getValue().getSpecialRequest());
             materialOrderItem.setMaterialType(entry.getValue().getMaterialType());
             materialOrderItem.setMakeCode(entry.getValue().getMakeCode());

src/main/webapp/WEB-INF/template/materialOrder/addFile.html

@@ -83,7 +83,7 @@
             <div class="submitBody-row">
                 <div class="submitBody-row-position">
                     <div class="input-wrapper required">
-                        <label>是否考虑管线号</label>
+                        <label>是否考虑管线号隔热代号</label>
                         <select id="ignoreLineAccount" name="ignoreLineAccount" data-init="false">
                             <option value="false">是</option>
                             <option value="true">否</option>
@@ -119,7 +119,7 @@
                 return;
             }
             if ($("#ignoreLineAccount").val() == null ||$("#ignoreLineAccount").val() == "null"){
-                Dialog.error("是否考虑管线号不能为空");
+                Dialog.error("是否考虑管线号隔热代号不能为空");
                 return;
             }
             if (!check()) {