1.线体对应多个机种

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -667,55 +667,63 @@ public class LiteOrderCache {
                             try {
                                 excludePosIds.add(pos.getId());
 
+                                List<String> modelList = new ArrayList<>();
+
                                 String model = orderItem.getModel();
                                 if (StringUtils.isEmpty(model)) {
-                                    //C02-3FSMT-18,C02-3FSMT-19,C02-3FSMT-09,C02-3FSMT-08
                                     String orderLine = cacheOrder.getLine();
                                     if (StringUtils.isNotEmpty(orderLine)) {
                                         if (orderLine.startsWith("C02-1FSMT-98")){
                                             model = "RAINIER";
                                         } else if (orderLine.startsWith("C02-3FSMT-03")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-04")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-05")){
-                                            model = "RAINIER";
+                                            modelList.add("X11");
                                         }else if (orderLine.startsWith("C02-3FSMT-06")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-07")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-13")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-14")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-15")){
-                                            model = "RAINIER";
+                                            modelList.add("X11");
                                         }else if (orderLine.startsWith("C02-3FSMT-16")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C02-3FSMT-17")){
-                                            model = "RAINIER";
+                                            modelList.add("RAINIER");
                                         }else if (orderLine.startsWith("C03-1FSMT-02")){
                                             model = "RAINIER";
                                         }else if (orderLine.startsWith("C03-1FSMT-12")){
                                             model = "RAINIER";
                                         }else if (orderLine.startsWith("C02-3FSMT-08")){
-                                            model = "X11";
+                                            modelList.add("X11");
                                         }else if (orderLine.startsWith("C02-3FSMT-18")){
-                                            model = "X11";
+                                            modelList.add("X11");
                                         }else if (orderLine.startsWith("C03-1FSMT-01")){
                                             model = "X11";
                                         }else if (orderLine.startsWith("C03-1FSMT-11")){
                                             model = "X11";
                                         }else if (orderLine.startsWith("C02-3FSMT-09")){
-                                            model = "X8";
+                                            modelList.add("X11");
+                                            modelList.add("X8");
                                         }else if (orderLine.startsWith("C02-3FSMT-19")){
-                                            model = "X8";
+                                            modelList.add("X8");
+                                            modelList.add("X11");
                                         } else {
-                                            model = "ALL";
+                                            modelList.add("ALL");
                                         }
                                     } else {
-                                        model = "ALL";
+                                        modelList.add("ALL");
                                     }
+                                } else {
+                                    modelList.add("ALL");
+                                }
+                                if (modelList == null || modelList.isEmpty()){
+                                    modelList.add("ALL");
                                 }
 
                                 //如果是迈征工单,不是满料,不出库
@@ -728,12 +736,13 @@ public class LiteOrderCache {
                                         throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库");
                                     }
                                 }*/
-
-                                List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model);
+                                for (String batchModel : modelList) {
+                                    List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",batchModel);
                                     if (batchCheckReel != null && !batchCheckReel.isEmpty()){
                                         disable = true;
                                         throw new ValidateException("",pos.getBarcode().getBarcode()+"被禁用,库位为:"+pos.getPosName());
                                     }
+                                }
                             } catch (ValidateException e) {
                                 pos = null;
                                 log.error("工单号:" + orderNo + " " + e.getMessage());