From 2cc5a1afe8296d148f0a32989395d538e5323a8e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 一月 2024 16:22:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index bafb93a..3357f1e 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -128,6 +128,8 @@
bsOrderScheduling.setProductionStatus("1");
bsOrderScheduling.setOperator(getUserName());
bsOrderScheduling.setOperateTime(fomateDate);
+ bsOrderScheduling.setProductType(omProductionOrdeInfo.getTypeL());//浜у搧绫诲瀷
+ bsOrderScheduling.setWhetherOrPrint("0");
bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
startCode++;
}
@@ -138,6 +140,7 @@
bsModelNumber.setModelDate(dateTimeRule);
bsModelNumber.setMaxnumValue((startCode - 1) + "");
bsModelNumber.setSaveTime(fomateDate);
+ bsModelNumber.setLastNumber((startCode - 1) + "");
bsModelNumberService.insertBsModelNumber(bsModelNumber);
}
//鏇存柊宸ュ崟鐘舵��
@@ -194,7 +197,9 @@
} catch (Exception e) {
return error("鎺ユ敹澶辫触锛佽妫�鏌ラ�氱煡鍗曞彿");
}
+ }else {
+ return warn("璇ラ�氱煡鍗曞凡缁忔帴鏀跺畬姣曪紝涓嶈兘閲嶅鎺ユ敹锛�");
}
- return warn("璇ヨ鍗曞凡鎺ユ敹瀹屾瘯锛屼笉鑳介噸澶嶆帴鏀讹紒");
+ return AjaxResult.success("鎺ユ敹鎴愬姛锛�");
}
}
--
Gitblit v1.9.3