From 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 10:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 17 ++--
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 29 ++++---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue | 16 ++-
north-glass-erp/northglass-erp/src/lang/zh.js | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue | 18 ++--
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 4
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 9 +-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 2
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 2
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 8 +-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 75 ++++++++++--------
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 3
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 2
13 files changed, 101 insertions(+), 86 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 19f8813..2363903 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
@@ -108,11 +108,11 @@
</tr>
<tr class="title-s">
- <th colspan="2"></th>
- <th colspan="5">
+ <th colspan="2" style="width: 30%"></th>
+ <th colspan="5" style="width: 40%;">
<h3>閿�鍞彂璐у崟</h3>
</th>
- <th colspan="2" style="text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
+ <th colspan="2" style="width: 30%;text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
</tr>
<tr>
<th style="text-align: left;border:none;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
@@ -462,7 +462,7 @@
}
@page {
size: auto;
- margin: 8mm 16mm 16mm 16mm
+ margin: 8mm 16mm 20mm 16mm;
}
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 211cfbf..c363bb8 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
@@ -107,11 +107,11 @@
</tr>
<tr class="title-s">
- <th colspan="2"></th>
- <th colspan="5">
+ <th colspan="2" style="width: 30%"></th>
+ <th colspan="5" style="width: 40%;">
<h3>閿�鍞彂璐у崟</h3>
</th>
- <th colspan="2" style="text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
+ <th colspan="2" style="width: 30%;text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
</tr>
<tr>
<th style="text-align: left;border:none;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
@@ -238,6 +238,7 @@
}
h3{
font-size: 1.2rem;
+ font-weight: bolder;
}
@@ -278,7 +279,7 @@
}
@page {
size: auto;
- margin: 8mm 16mm 16mm 16mm
+ margin: 8mm 16mm 20mm 16mm;
}
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index d0a4400..102174b 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -394,7 +394,7 @@
productType:'浜у搧绫诲瀷',
whetherToScheduleProduction:'鏄惁鎺掍骇',
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�',
- deleteNoProcedure:'鍒犻櫎澶辫触锛屾鏌ヤ笅宸ュ簭鏄惁宸叉姤宸�',
+ deleteNoProcedure:'鍒犻櫎澶辫触锛岃妫�鏌ヤ笅宸ュ簭鏄惁宸叉姤宸ユ垨鑰呭凡琛ョ墖杩斿伐',
pleaseCheckTheRequiredData:'璇峰嬀閫夐渶瑕佺殑鏁版嵁',
landingSequence:'钀芥灦椤哄簭',
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
index df6ccd8..25343e7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -137,7 +137,7 @@
display: flex;
justify-content: left;
flex-wrap: wrap;
- width: 400px;
+ width: 450px;
}
#entirety{
@@ -152,11 +152,17 @@
font-weight: bold;
height: 25px;
}
+.row1 span {
+ font-size: 12pt;
+}
.row2 {
font-size: 12pt;
font-weight: bold;
height: 25px;
+}
+.row2 span {
+ font-size: 12pt;
}
span {
font-size: 12pt;
@@ -175,14 +181,8 @@
font-weight: bold;
font-size: 12pt;
}
-.row1 span {
- font-size: 10pt;
-}
-.row2 span {
- font-size: 10pt;
-}
.row5 span {
- font-size: 10pt;
+ font-size: 12pt;
}
.row6 {
@@ -195,7 +195,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 2mm 2mm 2mm /* this affects the margin in the printer settings */
+ margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index d0a7f7c..b12b630 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -140,7 +140,7 @@
display: flex;
justify-content: left;
flex-wrap: wrap;
- width: 400px;
+ width: 450px;
}
#entirety{
@@ -155,11 +155,16 @@
font-weight: bold;
height: 35px;
}
-
+.row1 span {
+ font-size: 12pt;
+}
.row2 {
font-size: 12pt;
font-weight: bold;
height: 25px;
+}
+.row2 span {
+ font-size: 12pt;
}
span {
font-size: 12pt;
@@ -179,12 +184,6 @@
font-weight: bold;
font-size: 12pt;
}
-.row1 span {
- font-size: 12pt;
-}
-.row2 span {
- font-size: 12pt;
-}
.row5 span {
font-size: 12pt;
}
@@ -199,7 +198,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 2mm 2mm 2mm /* this affects the margin in the printer settings */
+ margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index c4e4419..305d6ab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -182,6 +182,10 @@
font-weight: bold;
height: 20px;
}
+.row1 span {
+ font-size: 8pt;
+ font-weight: bold;
+}
.row2 {
font-size: 8pt;
@@ -193,20 +197,11 @@
font-weight: bold;
}
-.row1 span {
- font-size: 8pt;
- font-weight: bold;
-}
-.row6 span {
- font-size: 10pt;
- font-weight: bold;
-}
-.row5 span {
- font-size: 10pt;
- font-weight: bold;
-}
+
+
+
.row3 {
@@ -221,18 +216,26 @@
font-weight: bold;
font-size: 8pt;
}
+.row5 span {
+ font-size: 10pt;
+ font-weight: bold;
+}
.row6 {
height: 20px;
font-weight: bold;
font-size: 8pt;
}
+.row6 span {
+ font-size: 10pt;
+ font-weight: bold;
+}
@page {
size: auto; /* auto is the initial value */
- margin: 13mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
+ margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
index 2e28546..147f202 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -152,11 +152,17 @@
font-weight: bold;
height: 20px;
}
+.row1 span {
+ font-size: 10pt;
+}
.row2 {
font-size: 8pt;
font-weight: bold;
height: 20px;
+}
+.row2 span {
+ font-size: 10pt;
}
span {
font-size: 10pt;
@@ -179,19 +185,15 @@
.row5 span {
font-size: 8pt;
}
-.row1 span {
- font-size: 10pt;
-}
-.row2 span {
- font-size: 10pt;
-}
+
+
@page {
size: auto; /* auto is the initial value */
- margin: 13mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
+ margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index ae48e49..4621df9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -25,7 +25,7 @@
Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);
- Boolean updateReportingWorkDetail(@Param("patchLog") PatchLog patchLog);
+ Boolean updateReportingWorkDetail(@Param("reportingWorkId") String reportingWorkId,@Param("orderSort") Integer orderSort,@Param("technologyNumber") Integer technologyNumber);
Boolean updateReplenish(@Param("patchLog") PatchLog patchLog , @Param("userName") String userName);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 7c5f076..13c704b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -94,7 +94,7 @@
//娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
patchMapper.insertReplenish(patchLog,oddNumber);
patchMapper.updateDamageDetails(patchLog);
- patchMapper.updateReportingWorkDetail(patchLog);
+ patchMapper.updateReportingWorkDetail(patchLog.getReportingWorkId(), Integer.valueOf(patchLog.getOrderSort()),patchLog.getTechnologyNumber());
}
}
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 ffdade5..8fc5a52 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
@@ -451,27 +451,47 @@
Integer count = reportingWorkMapper.selectCountByProcessId(processId, nextProcess);
//鑾峰彇鏈�鍚庝竴閬撳伐搴�
String lastProcess = reportingWorkMapper.selectLastProcess(processId);
- //鍒ゆ柇鏄惁鏄叆搴撳伐搴�
- if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
- //鏌ヨ璇ユ祦绋嬪崱鏁伴噺銆佸彲鍏ュ簱鏁伴噺銆佸凡鍏ュ簱鏁伴噺
- Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
- if (list.get("quantity") == list.get("receiptQuantity")) {
- return false;
- } else {
- //杞崲绫诲瀷:宸插叆搴撴暟閲�
- Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
- //杞崲绫诲瀷:鍙叆搴撴暟閲�
- Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
- //鏌ヨ璇ユ姤宸ョ紪鍙锋湰宸ュ簭瀹屽伐鏁伴噺
- Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
- //褰撹宸ュ簭瀹屽伐鏁伴噺灏忎簬绛変簬宸插叆搴撴暟閲忔椂
- //鍙叆搴撴暟閲�-宸插叆搴撴暟閲�>=鎶ュ伐缂栧彿鏈伐搴忓畬宸ユ暟閲�
- if (inventoryQuantity - receiptQuantity >= completedQuantity) {
+ //鑾峰彇鏄惁鏈夊凡琛ョ墖鎴栬繑宸�
+ Integer countStates= Integer.valueOf(reportingWorkMapper.getPatchConditionMp(reportingWorkId));
+ //鍒ゆ柇鏄惁鏈夎ˉ鐗囪繑宸ユ暟鎹�
+ if (countStates==0){
+ //鍒ゆ柇鏄惁鏄叆搴撳伐搴�
+ if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
+ //鏌ヨ璇ユ祦绋嬪崱鏁伴噺銆佸彲鍏ュ簱鏁伴噺銆佸凡鍏ュ簱鏁伴噺
+ Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
+ if (list.get("quantity") == list.get("receiptQuantity")) {
+ return false;
+ } else {
+ //杞崲绫诲瀷:宸插叆搴撴暟閲�
+ Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
+ //杞崲绫诲瀷:鍙叆搴撴暟閲�
+ Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
+ //鏌ヨ璇ユ姤宸ョ紪鍙锋湰宸ュ簭瀹屽伐鏁伴噺
+ Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
+ //褰撹宸ュ簭瀹屽伐鏁伴噺灏忎簬绛変簬宸插叆搴撴暟閲忔椂
+ //鍙叆搴撴暟閲�-宸插叆搴撴暟閲�>=鎶ュ伐缂栧彿鏈伐搴忓畬宸ユ暟閲�
+ if (inventoryQuantity - receiptQuantity >= completedQuantity) {
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
+ List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
+ for (Map<String, Object> item : workDateList) {
+ //鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺
+ reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
+ }
+ //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
+ reportingWorkMapper.deleteWork(reportingWorkId);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ } else {//涓嶆槸鍏ュ簱宸ュ簭
+ if (count == 0) {
//鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
for (Map<String, Object> item : workDateList) {
- //鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺
- reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
//鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
}
@@ -482,23 +502,10 @@
return false;
}
}
-
- } else {//涓嶆槸鍏ュ簱宸ュ簭
- if (count == 0) {
- //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
- List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
- for (Map<String, Object> item : workDateList) {
- //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
- reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
- }
- //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
- reportingWorkMapper.deleteWork(reportingWorkId);
- return true;
- } else {
- return false;
- }
}
-
+ else {
+ return false;
+ }
} else {
return false;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index 9e95501..9d4b983 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -25,6 +25,8 @@
@Transactional(rollbackFor = Exception.class)
public class ReworkService {
@Autowired
+ PatchLogMapper patchMapper;
+ @Autowired
ReworkMapper reworkMapper;
@Autowired
BasicDateProduceMapper basicDateProduceMapper;
@@ -107,6 +109,7 @@
//娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
reworkMapper.insertRework(rework,oddNumber);
reworkMapper.updateDamageDetails(rework);
+ patchMapper.updateReportingWorkDetail(rework.getReportingWorkId(), Integer.valueOf(rework.getOrderSort()),rework.getTechnologyNumber());
}
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index e67d237..d120567 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -111,8 +111,8 @@
</update>
<update id="updateReportingWorkDetail" >
- update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{patchLog.reportingWorkId}
- and order_number=#{patchLog.orderSort} and technology_number=#{patchLog.technologyNumber}
+ update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{reportingWorkId}
+ and order_number=#{orderSort} and technology_number=#{technologyNumber}
</update>
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 9e995ba..f948e84 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -287,7 +287,7 @@
right join (
select distinct process,teams from
( select distinct rw.this_process as process,rw.teams_groups_name as teams
- from reporting_work as rw where rw.process_id=#{processIdStr}
+ from reporting_work as rw where rw.process_id=#{processIdStr} and rw.reviewed_state>=0
) as t
) as rw
--
Gitblit v1.8.0