From d82642e04f2dd9f2dc04dd7196a1e83fcfc95913 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 11:31:40 +0800
Subject: [PATCH] order status
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java
index 3cf6817..2999306 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderSv.java
@@ -6,7 +6,6 @@
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoPr.*;
import com.dy.pmsGlobal.util.UserUtil;
-import com.dy.pmsProduct.taskPlan.PlanStatusEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +47,8 @@
if (orderDao.exists(p.name, p.id)) {
throw new RuntimeException("璁㈠崟鍚嶇О涓嶈兘閲嶅");
}
- p.setDeleted(false);
+ extractedCheck(p);
+ p.deleted = false;
BaUser loginUser = userUtil.getUser(UserTokenContext.get());
if (loginUser != null) {
p.creator = loginUser.id;
@@ -63,6 +63,7 @@
if (orderDao.exists(p.name, p.id)) {
throw new RuntimeException("璁㈠崟鍚嶇О涓嶈兘閲嶅");
}
+ extractedCheck(p);
int count = orderDao.updateByPrimaryKeySelective(p);
if (count > 0) {
saveOrderItems(p);
@@ -156,40 +157,42 @@
}
/**
* 鍙洿鏂扮姸鎬�,涓嶆洿鏂板叾浠栧瓧娈�
- * @param plan
+ * @param order
* 鏇存柊鐘舵�� 濡傛灉鏈夊湪鎵ц涓殑浠诲姟,涓嶈鏆傚仠
* @return
*/
- /* @Transactional
- public int updateStatus(PrOrder plan) {
- if(plan.status == PlanStatusEnum.NORMAL.getCode()){
- PrAssemblyPlan assemblyPlan = assemblyDao.selectByPrimaryKey(plan.id);
- assemblyPlan.status = plan.status;
- extractedCheck(assemblyPlan);
+ @Transactional
+ public int updateStatus(PrOrder order) {
+ if(order.status == OrderStatusEnum.NORMAL.getCode()){
+ PrOrder prOrder = orderDao.selectByPrimaryKey(order.id);
+ prOrder.status = order.status;
+ extractedCheck(prOrder);
}
- PrAssemblyPlan param = new PrAssemblyPlan();
- param.id =plan.id;
- param.status = plan.status;
- return assemblyDao.updateByPrimaryKeySelective(param);
+ PrOrder param = new PrOrder();
+ param.id =order.id;
+ param.status = order.status;
+ return orderDao.updateByPrimaryKeySelective(param);
}
- private void extractedCheck(PrAssemblyPlan plan) {
- PrProductionProcess process = processDao.selectByPrimaryKey(plan.processId);
- if(process == null || !process.proId.equals(plan.proId)){
- throw new RuntimeException("浜у搧涓庣敓浜ф祦绋嬩笉鍖归厤");
- }
- //寮�濮嬫棩鏈熻灏忎簬缁撴潫鏃ユ湡
- if(plan.startDate.compareTo(plan.endDate) > 0){
- throw new RuntimeException("寮�濮嬫棩鏈熶笉鑳藉ぇ浜庣粨鏉熸棩鏈�");
- }
- //Fancy add 2024/07/09 濡傛灉鐘舵�佷负鎵ц ,鍒欑粨鏉熸棩鏈熷繀椤诲ぇ浜庣瓑浜庡綋鍓嶆棩鏈�
- if(plan.status == PlanStatusEnum.NORMAL.getCode()){
- String endDateStr = plan.getEndDate();
- LocalDate endDate = LocalDate.parse(endDateStr, DateTimeFormatter.ISO_LOCAL_DATE);
+ //濡傛灉浜ゆ湡灏忎簬褰撳墠鏃堕棿,涓嶅厑璁歌缃负姝ｅ父
+ private void extractedCheck(PrOrder order) {
+ if(order.status == OrderStatusEnum.NORMAL.getCode()){
+ String deliveryDateStr = order.getDeliveryDate();
+ LocalDate endDate = LocalDate.parse(deliveryDateStr, DateTimeFormatter.ISO_LOCAL_DATE);
LocalDate nextDay = endDate.plusDays(1);
LocalDate today = LocalDate.now(); // 鑾峰彇褰撳墠鏃ユ湡
if (nextDay.isBefore(today)) {
- throw new RuntimeException("鎵ц鐘舵�佺粨鏉熸棩鏈熷繀椤诲ぇ浜庣瓑浜庡綋鍓嶆棩鏈�,璇蜂慨鏀圭粨鏉熸棩鏈�");
+ throw new RuntimeException("浜や粯鏃ユ湡蹇呴』澶т簬绛変簬褰撳墠鏃ユ湡,璇蜂慨鏀逛氦浠樻棩鏈�");
}
}
- }*/
+ //濡傛灉鏈夊湪鐢熶骇鐨勪换鍔′笉鑳借缃负鏆傚仠 鎴� 缁撴潫
+ /*
+ PrProductionProcess process = processDao.selectByPrimaryKey(order.processId);
+ if(process == null || !process.proId.equals(order.proId)){
+ throw new RuntimeException("浜у搧涓庣敓浜ф祦绋嬩笉鍖归厤");
+ }
+ //寮�濮嬫棩鏈熻灏忎簬缁撴潫鏃ユ湡
+ if(order.startDate.compareTo(order.endDate) > 0){
+ throw new RuntimeException("寮�濮嬫棩鏈熶笉鑳藉ぇ浜庣粨鏉熸棩鏈�");
+ }*/
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0