add-415

吴健

10 天以前 8b43954926db6b4df6a61ab6e04d6cb11189069d

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -344,7 +344,7 @@
        if (StringUtils.isEmpty(engineNo)){
            return R.fail(500,"箱体码不能为空，请重试");
        }
        if (!engineNo.contains(",")){
        if (!engineNo.contains(",") && !engineNo.contains("/") ){
            return R.fail(500,"箱体码格式有误，请重试");
        }
        ProductNewPassStation checkStation = new ProductNewPassStation();
@@ -428,7 +428,7 @@

                if (StrUtil.isNotBlank(OrderScheduling.getEngineNo())){
                    String snCode = OrderScheduling.getEngineNo();
                    if (snCode.startsWith("280") || snCode.startsWith("380")){
                    if (snCode.startsWith("280") || snCode.startsWith("380") || snCode.startsWith("196") || snCode.startsWith("296")){
                        ProductNewPassStation productNewPassStation = new ProductNewPassStation();
                        UUID uuid = UUID.randomUUID();
                        productNewPassStation.setId(uuid.getMostSignificantBits());
@@ -438,8 +438,12 @@
                        productNewPassStation.setBoxCode(engineNo);
                        if (snCode.startsWith("280")){
                            productNewPassStation.setProductType("280");
                        } else {
                        } else if (snCode.startsWith("380")){
                            productNewPassStation.setProductType("380");
                        } else if (snCode.startsWith("196")){
                            productNewPassStation.setProductType("196");
                        } else if (snCode.startsWith("296")){
                            productNewPassStation.setProductType("296");
                        }
                        productNewPassStationService.insertPassStation(productNewPassStation);
                    }