From 8b43954926db6b4df6a61ab6e04d6cb11189069d Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 15 四月 2025 08:54:08 +0800
Subject: [PATCH] add-415
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 3723ce2..1c686c0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/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);
}
--
Gitblit v1.9.3