From 0694578372524db4daef9031074a0e9921b56382 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 18 九月 2025 14:07:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml | 2 ++
north-glass-erp/northglass-erp/src/hook/createTemplateTag.js | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js b/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
index f0cd794..11c2497 100644
--- a/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
+++ b/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
@@ -54,6 +54,7 @@
return item;
})
//鍒ゆ柇鎬讳釜鏁版槸鍚﹁秴杩囨爣绛炬暟閲�
+
if(limitCount<dataList.length){
template.panels[0].printElements = template.panels[0].printElements.concat(printElements2)
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
index b8b646a..ac4583a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml
@@ -17,6 +17,7 @@
<if test="needOrderNumber!=null">
and a.order_number = #{orderNumber}
</if>
+ and a.available=0
and a.technology_number =#{technologyNumber}
and a.breakage_quantity>0
and b.reviewed_state>=0
@@ -44,6 +45,7 @@
<if test="orderNumber!= null || orderNumber!=''">
and a.order_number = #{orderNumber}
</if>
+ and a.available=0
and a.technology_number = #{technologyNumber}
and a.breakage_quantity>0
and ifnull(c.review_status,0) = 0
--
Gitblit v1.8.0