From 2e8ef31112579cc3f320a4f2b95232f0c35021fd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 18 三月 2025 08:16:13 +0800
Subject: [PATCH] 删除遗漏的前端获取的时间
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 b28f9c7..9f34bf6 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
@@ -123,7 +123,15 @@
log.setFunction("saveOrderTitle淇濆瓨琛ㄥご:"+order.getOrderId());
Order order1 = orderMapper.selectOrderId(order.getOrderId());
+ //浣跨敤璁㈠崟鍘熸湰鐨勭姸鎬佸拰璁＄畻鏂瑰紡
order.setCalculateType(order1.getCalculateType());
+ order.setCreateOrder(order1.getCreateOrder());
+ order.setProcessReview(order1.getProcessReview());
+ order.setOrderReview(order1.getOrderReview());
+ order.setProductionOrder(order1.getProductionOrder());
+ order.setProcessingCard(order1.getProcessingCard());
+ order.setWarehousing(order1.getWarehousing());
+ order.setDelivery(order1.getDelivery());
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
@@ -886,4 +894,13 @@
log.setFunction("updateOrderMoney閲戦閲嶇疆:"+orderId);
return true;
}
+
+ public Object scannerGlassInfo(String projectNo) {
+ String projectId = "p" + projectNo.substring(0,8);
+ Integer heatNo = Integer.valueOf(projectNo.substring(8,11));
+ Integer sortNo = Integer.valueOf(projectNo.substring(11,14));
+ String processId = orderMapper.getProcessIdByOptimizeHeatDetail(projectId,heatNo,sortNo);
+ String orderId = flowCardMapper.getOrderIdByProcessId(processId);
+ return orderMapper.scannerGlassInfo(projectId,heatNo,sortNo,orderId);
+ }
}
--
Gitblit v1.8.0