From 421becb5838430ec5fa4edfc5370e07f73c9928d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 10:30:14 +0800
Subject: [PATCH] 工程打印界面新增厚度膜系显示
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 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..c47bdda 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;
@@ -122,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());
@@ -493,9 +502,21 @@
BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getQuantity());
BigDecimal getComputeGrossArea= BigDecimal.valueOf(orderDetail.getComputeGrossArea());
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
if (calculateType == 3) {
orderDetail.setGrossAmount(getPrice.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
- } else {
+ }else if (calculateType == 4) {
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
+ orderDetail.setGrossAmount(getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue());
+ }else{
+ orderDetail.setGrossAmount(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }
+ }else if (calculateType == 1){
+ orderDetail.setGrossAmount(getPrice.multiply(getComputeArea).multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }else{
orderDetail.setGrossAmount(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
}
return orderDetail;
@@ -840,6 +861,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 +885,41 @@
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);
}
+ //鏃ュ織浼犲叆
+ 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;
+ }
- return null;
+ public Object scannerGlassInfo(String projectNo) {
+ try{
+ 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);
+ }catch (Exception e){
+ return null;
+ }
+
}
}
--
Gitblit v1.8.0