From 71a4444510d9067654705f0c5803d5f12a21a092 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 11 十一月 2025 09:17:34 +0800
Subject: [PATCH] 添加流程卡进度接口信息
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 684f526..e0c08ac 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -6,6 +6,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
@@ -1485,6 +1486,9 @@
if (orderDetail.getQuantity() > shelfQuantity) {
newOrderDetail.setProcessId(processId);
+ newOrderDetail.setLongSide(orderDetail.getLongSide());
+ newOrderDetail.setShortSide(orderDetail.getShortSide());
+ newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());
newOrderDetail.setQuantity(Long.valueOf(shelfQuantity));
newOrderDetail.setHeight(orderDetail.getHeight());
newOrderDetail.setWidth(orderDetail.getWidth());
@@ -1498,6 +1502,10 @@
shelfQuantity = shelfQuantity - shelfQuantity;
} else {
newOrderDetail.setProcessId(processId);
+ newOrderDetail.setLongSide(orderDetail.getLongSide());
+ newOrderDetail.setShortSide(orderDetail.getShortSide());
+ newOrderDetail.setBuildingNumber(orderDetail.getBuildingNumber());
+
newOrderDetail.setQuantity(orderDetail.getQuantity());
newOrderDetail.setHeight(orderDetail.getHeight());
newOrderDetail.setWidth(orderDetail.getWidth());
@@ -1560,12 +1568,30 @@
public Boolean updateTerminationSv(String processId, Integer orderNumber, Integer value) {
if (processId!=""){
+
flowCardMapper.updateTerminationMp(processId,orderNumber,value);
+ //鑾峰彇缁堟鏁伴噺涓庢祦绋嬪崱鏁伴噺姣旇緝
+ Map<String, Object> data = flowCardMapper.getTerminationQuantity(processId,orderNumber);
+ Integer terminationNum = (Integer) data.get("termination_quantity");
+ Integer totalNum = (Integer) data.get("quantity");
+ if (terminationNum==totalNum){
+ flowCardMapper.updateTerminationStatus(processId,orderNumber);
+ }
return true;
}else {
return false;
}
+ }
+
+ public Boolean updateTerminationNoSv(String processId, Integer orderNumber) {
+ if (processId!=""){
+ flowCardMapper.updateTerminationNoMp(processId,orderNumber);
+
+ return true;
+ }else {
+ return false;
+ }
}
public Map<String, Object> selectCompletedSv(String processId, Integer orderNumber, String process) {
@@ -1703,8 +1729,25 @@
}
+ public Result selectProcessCardProgressSv(Map<String, String> object) {
+ String orderId = object.get("orderId");
+ String processId = object.get("processId");
+ String orderNumber = object.get("orderNumber");
+ String technologyNumber = object.get("technologyNumber");
+ String process = object.get("process");
+ Result result = new Result();
+ //褰撴祦绋嬪崱鍜岃鍗曞彿閮戒负绌烘椂锛岃繑鍥炴彁绀轰俊鎭�
+ if (orderId == null &&processId == null){
+ result.setCode(Constants.Code_600);
+ result.setMsg("Please enter at least one parameter for the order number and the process card.");
+ return result;
+ }
+ return result.success(
+ orderProcessDetailMapper
+ .selectProcessCardProgressSv( orderId, processId, orderNumber, technologyNumber, process)
+ );
-
+ }
}
--
Gitblit v1.8.0