From b39599abcfce0b8db09fc5c94ff4655a2dc99ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 11:48:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 12 +++--
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 42 +++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java | 2 +
north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml | 8 ++++
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 6 ++-
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 3 +
6 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index e250e54..1276555 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -204,12 +204,13 @@
<th style="width: 6%;">搴忓彿</th>
<th style="width: 10%;">妤煎眰缂栧彿</th>
<th style="width: 7%;">绠卞彿</th>
- <th style="width: 17%;" colspan="1">瀹絏楂�</th>
- <th style="width: 10%;">鏁伴噺</th>
+ <th style="width: 15%;" colspan="1">瀹絏楂�</th>
+ <th style="width: 8%;">鏁伴噺</th>
<th style="width: 10%;">闈㈢Н</th>
- <th style="width: 10%;">鍗曚环</th>
+ <th style="width: 8%;">鍗曚环</th>
<th style="width: 12%;">閲戦</th>
- <th style="width: 18%;" colspan="2">鍔犲伐瑕佹眰</th>
+ <th style="width: 12%;" >鍔犲伐瑕佹眰</th>
+ <th style="width: 12%;">澶囨敞</th>
</tr>
@@ -236,7 +237,8 @@
<td>{{items.area}}</td>
<td>{{items.price}}</td>
<td>{{items.money}}</td>
- <td colspan="2">{{items.processingNote}}</td>
+ <td>{{items.processingNote}}</td>
+ <td>{{items.remarks}}</td>
</tr>
<tr class="day-in" >
<td style="font-size: 15px;" colspan="4">灏忚:</td>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index 85663ac..d818236 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -151,7 +151,8 @@
<th style="width: 20%;" colspan="2">瀹絏楂�</th>
<th style="width: 10%;">鏁伴噺</th>
<th style="width: 10%;">闈㈢Н</th>
- <th style="width: 32%;" colspan="3">鍔犲伐瑕佹眰</th>
+ <th style="width: 22%;" colspan="2">鍔犲伐瑕佹眰</th>
+ <th style="width: 12%;">澶囨敞</th>
</tr>
@@ -176,7 +177,8 @@
</td>
<td>{{items.quantity}}</td>
<td>{{items.area}}</td>
- <td colspan="3">{{items.processingNote}}</td>
+ <td colspan="2">{{items.processingNote}}</td>
+ <td>{{items.remarks}}</td>
</tr>
<tr class="day-in" >
<td style="font-size: 15px;" colspan="5">灏忚:</td>
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index 0d09f44..f3a5939 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -68,6 +68,9 @@
private Integer importNumber;
//璁㈠崟杞Щ瀵煎嚭鏁伴噺
private Integer exportNumber;
+
+ //缁堟鏁伴噺
+ private Integer terminationQuantity;
//杩炵嚎鐘舵��(0涓嶈繛绾�1杩炵嚎锛岄粯璁�1锛屾坊鍔犳椂闂�
private Integer onlineStatus;
//寤虹珛鏃堕棿
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
index 52c4b3a..1926bbb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java
@@ -28,4 +28,6 @@
Integer selectInventory(@Param("processId") String processId, @Param("orderNumber") Integer orderNumber, @Param("technologyNumber") Integer technologyNumber, String thisProcess);
String getGlassPliesCount(String reportingWorkId);
+
+ int selectFinishQuantity(String reportingWorkId);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index d3e2920..646858a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1728,6 +1728,38 @@
JSONObject.toJSONString(stringRedisTemplate.opsForHash().entries(detailKey))
, ReportingWorkDetail.class
);
+
+ //鍒ゆ柇娴佺▼鍗℃槸鍚︽姤婊�
+ FlowCard flowCard = flowCardMapper.selectOne(new LambdaQueryWrapper<FlowCard>()
+ .eq(FlowCard::getProcessId, reportingWork.getProcessId())
+ .eq(FlowCard::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(FlowCard::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ );
+ //鐢熶骇鏁伴噺= 娴佺▼鍗℃暟閲�-缁堟鏁伴噺
+ int flowCardReportingWorkNum = flowCard.getQuantity()-flowCard.getTerminationQuantity();
+ OrderProcessDetail orderProcessDetail = orderProcessDetailMapper
+ .selectOne(new LambdaQueryWrapper<OrderProcessDetail>()
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
+ .eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
+ );
+ //鎶ュ伐鏁伴噺
+ int completedQuantity = reportingWorkDetail.getCompletedQuantity();
+ //宸叉姤鏁伴噺
+ int finishReportingWorkNum = orderProcessDetail.getReportingWorkNum();
+
+ //鑻ユ姤宸ユ暟閲�+宸叉姤鏁伴噺>娴佺▼鍗℃暟閲� 鍒欐姤宸ユ暟閲忎负娴佺▼鍗℃暟閲�-宸叉姤鏁伴噺
+ if((completedQuantity+finishReportingWorkNum)>flowCardReportingWorkNum){
+ completedQuantity = flowCardReportingWorkNum - finishReportingWorkNum;
+ reportingWorkDetail.setCompletedQuantity(completedQuantity);
+ //鑻ユ姤宸ユ暟閲忓皬浜�0 鍒欐姤宸ユ暟閲忎负0
+ if(completedQuantity<0){
+ reportingWorkDetail.setCompletedQuantity(0);
+ }
+ }
+
+
reportingWorkDetail.setReportingWorkId(reportingWorkId);
reportingWorkDetailMapper.insert(reportingWorkDetail);
@@ -1743,8 +1775,18 @@
orderProcessDetailMapper.update(null, updateWrapper);
});
+
+ //鑾峰彇瀹屽伐鏄庣粏鏁伴噺鎬诲拰
+ int num = reportingWorkDetailMapper.selectFinishQuantity(reportingWorkId);
+ reportingWorkMapper.update(null,
+ new LambdaUpdateWrapper<ReportingWork>()
+ .eq(ReportingWork::getReportingWorkId, reportingWorkId)
+ .setSql("this_completed_quantity = " + num)
+ );
+
}
+
});
}
Set<String> uploadKeys = stringRedisTemplate.keys("upload:reportingWork:*");
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
index b8a6891..1df8fd1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml
@@ -268,4 +268,12 @@
</select>
+ <select id="selectFinishQuantity">
+ select sum(a.completed_quantity) from (Select completed_quantity
+ from pp.reporting_work_detail
+ where reporting_work_id = #{reportingWorkId}
+ group by order_number) a
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0