bug修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java

@@ -181,7 +181,7 @@ public class PlateDO extends BaseDO {
     /**
      * 排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠
      */
-    private Integer filterType;
+    private String filterType;
     /**
      * 备注
      */

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java

@@ -291,8 +291,9 @@ public class ApiTypeRealize {
                     .phoneNumber(order.getString("ConsigeePhone"))
                     .dealer(order.getString("CustomName"))
                     .dealerPhoneNumber("无")
-                    .salesman(order.getString("SalePerson"))
-                    .splitter("无")
+//                    .salesman(order.getString("SalePerson"))
+                    .salesman("")
+                    .splitter("")
                     .remark(orderRemark + order.getString("Remark"))
                     .build();
             return orderDO;
@@ -582,6 +583,7 @@ public class ApiTypeRealize {
                         .isSculpt(plate.getBoolean("IsModel"))
                         .isSpecialShaped(plate.getBoolean("UnRegular"))
                         .isCancel(false)
+                        .filterType("")
                         .remark(remark)
                         .build();
 
@@ -608,6 +610,15 @@ public class ApiTypeRealize {
                             .setDrillsRemark(plate.getString("DrillsRemark"))
                             .setInfoRemark(plate.getString("InfoRemark"))
                             .setRemarkJsonDei(plate.getString("RemarkJson"));
+                    if (plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() > 0){
+                        plateInfo.setFilterType(plateInfo.getFilterType() + ",1");
+                    }
+                    if (plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() > 0){
+                        plateInfo.setFilterType(plateInfo.getFilterType() + ",2");
+                    }
+                    if (plateDetail.get(plate.getLong("BlockNo")).getHas2DModel()){
+                        plateInfo.setFilterType(plateInfo.getFilterType() + ",4");
+                    }
 
                 }
                 if (plateMap.get(plate.getLong("BlockNo")) != null) {