From 46bf33053daa5f2bfe163822ce4f793f669024f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 10 三月 2025 08:28:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 3 +++
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 2 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 10 ++++++++++
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 4 ++--
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 5 +++--
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 3 +--
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 2 +-
7 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
index 30cb948..ded2875 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -633,7 +633,7 @@
{
tid: 'custom4', title: '鑷畾涔�4', data: '', type: 'text',
options: {
- field: '',
+ field: 'custom4',
testData: '',
width:270,
height: 16,
@@ -645,7 +645,7 @@
{
tid: 'custom5', title: '鑷畾涔�5', data: '', type: 'text',
options: {
- field: '',
+ field: 'custom4',
testData: '',
width:270,
height: 16,
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 8bf68e4..b8110eb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -73,6 +73,7 @@
const orderId = route.query.orderId
const productionId = route.query.productionId
+const orderQuantity = route.query.quantity
const orderOtherMoney = ref(null)
@@ -894,6 +895,15 @@
gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return;
}
+
+ // 璁＄畻 $table 閲� quantity 瀛楁鐨勬�诲拰
+ let totalQuantity = selectRecords.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
+ // 瀵规瘮鍏ㄥ眬鍙橀噺 orderQuantity
+ if (totalQuantity !== orderQuantity*1) {
+ ElMessage.warning(`鎵�閫夋暟鎹殑鏁伴噺鎬诲拰 (${totalQuantity}) 涓庤鍗曟暟閲� (${orderQuantity}) 涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛乣);
+ gridLeftOptions.toolbarConfig.buttons[0].disabled = false;
+ return;
+ }
// if (leftData.length!=selectRecords.length){
// ElMessage.warning('璇峰嬀閫夋墍鏈夋暟鎹繘琛屼繚瀛�')
// gridLeftOptions.toolbarConfig.buttons[0].disabled=false
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index 8d5734e..35635da 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -19,7 +19,7 @@
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({
path: '/main/processCard/AddProcessCard',
- query: {orderId: row.order_id, productionId: row.production_id}
+ query: {orderId: row.order_id, productionId: row.production_id, quantity:row.quantity}
})
break
}
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 95f6e9e..e6cae01 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
@@ -4,7 +4,6 @@
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
-import com.example.erp.entity.userInfo.Log;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -50,6 +49,6 @@
Boolean updateReplenishCancel(@Param("patchLog") PatchLog patchLog);
- Integer selectProjectCount(String processId);
+ Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
}
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 c7d90d0..8bf6888 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
@@ -306,7 +306,7 @@
if (!patchLoglist.isEmpty()){
for (PatchLog patchLog : patchLoglist) {
//鏌ヨ鏄惁宸茬敓鎴愬伐绋嬪彿
- Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId());
+ Integer projectCount = patchMapper.selectProjectCount(patchLog.getProcessId(),patchLog.getPatchId(),patchLog.getTechnologyNumber());
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(patchLog.getProcessId(), String.valueOf(patchLog.getTechnologyNumber()));
if (projectCount == 0){
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 2673d3f..3e80ef7 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
@@ -272,6 +272,9 @@
if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
+ if (isPatch == 1){
+ damageDetail.setQualityInsStatus(2);
+ }
damageDetailsMapper.insert(damageDetail);
});
}
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 7c21908..7e9e30c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -413,8 +413,9 @@
<select id="selectProjectCount">
SELECT COUNT(*)
- FROM flow_card
- WHERE process_id= #{processId} and project_no IS not NULL;
+ FROM patch_log
+ WHERE process_id= #{processId} and patch_id=#{patchId} and technology_number = #{technologyNumber}
+ and project_no IS not NULL;
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0