guoyuji
2024-06-19 015946bce2b21c1f5108c3599ce076c53ed8b9f1
打印  根据没有大小片不显示明细信息
6个文件已修改
26 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -165,7 +165,7 @@
          <td></td>
        </tr>
        <tr>
        <tr v-if="item1.differentSize">
          <td></td>
          <td>标记</td>
          <td colspan="4">半成品名称</td>
@@ -176,7 +176,7 @@
          <td colspan="4"></td>
        </tr>
          <tr  v-for="(item2,index2) in item1.orderGlassDetails" :key="index2" >
        <tr v-if="item1.differentSize" v-for="(item2,index2) in item1.orderGlassDetails" :key="index2" >
            <td style="border: 0"></td>
            <td>{{ item2.technologyNumber }}</td>
@@ -208,7 +208,7 @@
        <td colspan=""></td>
      </tr>
      <tr>
        <td colspan="14">
        <td colspan="14" style="white-space: pre-wrap;text-align:left ">
          <template v-for="(item,index) in data.order.processingNote.split('\n')">
            {{item}}
            <br>
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -62,6 +62,8 @@
    private String levelTwo;
    @TableField(exist= false)
    private String totalThickness;
    @TableField(exist= false)
    private Integer differentSize;//用于标签打印时  明细是否显示
    //private Product product;
}
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderGlassDetailMapper.java
@@ -17,4 +17,6 @@
    List<OrderGlassDetail> selectOrderGlassDetailByOrderId(@Param("orderId") String orderId);
    void updateSizeAndProcess(@Param("orderGlassDetails")List<OrderGlassDetail> orderGlassDetails);
    Integer getDifferentSizeNumber(String orderId, Integer orderNumber);
}
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -472,7 +472,9 @@
                                new QueryWrapper<OrderGlassDetail>().
                                        eq("order_id",orderId).
                                        eq("order_number",orderDetail.getOrderNumber())
                        );
                );
                Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
                orderDetail.setDifferentSize(differentSize);
                orderDetail.setOrderGlassDetails(orderGlassDetails);
            });
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -787,4 +787,6 @@
</mapper>
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -143,4 +143,14 @@
        </foreach>
    </update>
    <select id="getDifferentSizeNumber">
       select if(count(id)>1,1,0) from (select
          id
        from order_glass_detail as a
        where a.order_id = #{orderId}
          and a.order_number = #{orderNumber}
        group by child_width,child_height) as c
    </select>
</mapper>