From 017b7068133d0887a57c3267d3c9a5860408f9a8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 十二月 2025 10:19:18 +0800
Subject: [PATCH] 补片实体新增字段，订单首页流程卡基础数据null判断
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java | 2 ++
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 22 ++++++++++++----------
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 3 +++
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java
index 24ac5a4..ca72627 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java
@@ -31,6 +31,8 @@
private Integer reviewStatus;
//鏋跺彿
private String rack;
+ //琛ョ墖鐘舵��
+ private String patchState;
//鍒涘缓鏃堕棿
private LocalDate createTime;
//淇敼鏃堕棿
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index ad0c82b..1fb973b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -209,17 +209,19 @@
.eq("basic_name",uniqueList.get(i).get("process"))
.last("limit 1")
);
+ if(basicData!=null){
+ //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
+ if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
+ clos.put(uniqueList.get(i).get("process"), 15+i);
+ }
+ //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
+ if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
+ columns.add("reportWorkQuantity."+uniqueList.get(i).get("process"));
+ }
+ }
- //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
- //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
- if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
- clos.put(uniqueList.get(i).get("process"), 15+i);
- }
- //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
- //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
- if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add("reportWorkQuantity."+uniqueList.get(i).get("process"));
- }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 3e6dd5a..25dd224 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -570,12 +570,15 @@
List<Map<String, Object>> deliveryDetailList2;
if(state==3){
+ //娲涢槼鏈夐噾棰�
deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingMoneySpecifications(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}else if(state==4){
+ //娲涢槼鏃犻噾棰�
deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingNoMoneySpecifications(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}else{
+ //閫氱敤
deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
}
--
Gitblit v1.8.0