From e0b33e130fbb5b7d9ada54f675011b688f0b147a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 14 二月 2025 08:50:07 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index c89cf0d..b28f9c7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -1,5 +1,6 @@
package com.example.erp.service.sd;
+import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -840,6 +841,19 @@
}
public Object processBack(String orderId,Integer status) {
+ //鍒ゆ柇鏄惁杞紭鍖�
+ if(flowCardMapper.flowCardToOptimizeCount(orderId)>0){
+ return "false1";
+ }
+ //鍒ゆ柇鏄惁鏈夋姤宸�
+ if(flowCardMapper.reportingWorkCountByOrderId(orderId)>0){
+ return "false2";
+ }
+ //鍒ゆ柇鏄惁鏈夊簱瀛�
+ if(orderMapper.searchOrderWarehousing(orderId)>0){
+ return "false3";
+ }
+ //閫�鍥炲埌鐢熶骇鍔犲伐鍗�
if(status<5){
//鏇存柊灏忕墖鏄庣粏琛ㄥ垎鏋剁姸鎬�
flowCardMapper.updateDeleteState(orderId,"all");
@@ -851,18 +865,25 @@
flowCardMapper.deleteflowCardSortByOrderId(orderId);
flowCardMapper.updateProcessingCard(orderId, 0);
}
+ //閫�鍥炲埌璁㈠崟瀹℃牳鍚�
if(status<4){
workOrderMapper.deleteOrderWorkMp(orderId, null);
workOrderMapper.updateWorkType(orderId, 0);
}
+ //閫�鍥炲埌宸ヨ壓瀹℃牳鍚�
if(status<3){
orderMapper.backReviewOrderById(orderId);
}
-
+ //閫�鍥炲埌涓嬪崟鍚�
if(status<2){
orderMapper.reviewProcessById(orderId,0);
}
-
- return null;
+ //鏃ュ織浼犲叆
+ Log log = new Log();
+ log.setOperator((String) StpUtil.getLoginId());
+ log.setOperatorId((String) StpUtil.getLoginId());
+ log.setContent(String.valueOf(status));
+ log.setFunction("updateOrderMoney閲戦閲嶇疆:"+orderId);
+ return true;
}
}
--
Gitblit v1.8.0