廖井涛
2025-09-18 0694578372524db4daef9031074a0e9921b56382
Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
2个文件已修改
3 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/hook/createTemplateTag.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/DamageDetails.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
            }
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