diff --git a/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java b/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java index 27594df..5f33aee 100644 --- a/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java +++ b/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java @@ -84,4 +84,6 @@ public class PrintRollLabelRecord { @TableField(exist = false) private String serialNumberRequired; + @TableField(exist = false) + private String rollLabelFlag; } diff --git a/src/main/java/com/gaotao/modules/part/entity/ExternalPartCustomer.java b/src/main/java/com/gaotao/modules/part/entity/ExternalPartCustomer.java index 9646c28..17e03fd 100644 --- a/src/main/java/com/gaotao/modules/part/entity/ExternalPartCustomer.java +++ b/src/main/java/com/gaotao/modules/part/entity/ExternalPartCustomer.java @@ -100,4 +100,6 @@ public class ExternalPartCustomer { private String printStr2; @TableField(exist = false) private String printStr3; + @TableField(exist = false) + private String rollLabelFlag; } diff --git a/src/main/java/com/gaotao/modules/part/entity/Part.java b/src/main/java/com/gaotao/modules/part/entity/Part.java index e29f719..8406d1c 100644 --- a/src/main/java/com/gaotao/modules/part/entity/Part.java +++ b/src/main/java/com/gaotao/modules/part/entity/Part.java @@ -77,6 +77,11 @@ public class Part { private String provisionalData; + /** + * Y:打印小标签;N:打印大标签 + */ + private String rollLabelFlag; + @TableField(exist = false) private List provisionalDataList; } diff --git a/src/main/java/com/gaotao/modules/part/service/impl/PartServiceImpl.java b/src/main/java/com/gaotao/modules/part/service/impl/PartServiceImpl.java index fe7c94f..dcc4014 100644 --- a/src/main/java/com/gaotao/modules/part/service/impl/PartServiceImpl.java +++ b/src/main/java/com/gaotao/modules/part/service/impl/PartServiceImpl.java @@ -124,6 +124,7 @@ public class PartServiceImpl extends ServiceImpl implements Pa .set(Part::getPrintStr1,part.getPrintStr1()) .set(Part::getPrintStr2,part.getPrintStr2()) .set(Part::getPrintStr3,part.getPrintStr3()) + .set(Part::getRollLabelFlag,part.getRollLabelFlag()) .update(); } @@ -523,6 +524,7 @@ public class PartServiceImpl extends ServiceImpl implements Pa .eq(ExternalPartPicture::getPartNo, one.getPartNo()) .remove(); } + part.setRollLabelRequired("N");// 卷标签标记为N baseMapper.insert(part); } for (ExternalPartCustomer externalPartCustomer : externalPartCustomerList) { diff --git a/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml b/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml index 908b35c..6953141 100644 --- a/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml +++ b/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml @@ -26,7 +26,8 @@ u.um_name, plr.qty_per_roll, p.serial_number_required, - p.roll_label_required + p.roll_label_required, + p.roll_label_flag from print_roll_label_record plr left join part p on p.part_no = plr.part_no and p.site = plr.site left join customer c on c.site = plr.site and c.customer_no = plr.customer_no @@ -81,7 +82,8 @@ u.um_name, plr.qty_per_roll, p.serial_number_required, - p.roll_label_required + p.roll_label_required, + p.roll_label_flag from print_roll_label_record plr left join part p on p.part_no = plr.part_no and p.site = plr.site left join customer c on c.site = plr.site and c.customer_no = plr.customer_no diff --git a/src/main/resources/mapper/part/ExternalPartCustomerMapper.xml b/src/main/resources/mapper/part/ExternalPartCustomerMapper.xml index c6ee3a5..2403065 100644 --- a/src/main/resources/mapper/part/ExternalPartCustomerMapper.xml +++ b/src/main/resources/mapper/part/ExternalPartCustomerMapper.xml @@ -106,7 +106,8 @@ wu.um_name as weight_um_name, p.print_str1, p.print_str2, - p.print_str3 + p.print_str3, + p.roll_label_flag from part p left join external_part_customer epc on epc.site = p.site and epc.part_no = p.part_no left join customer c on epc.site = c.site and epc.customer_no = c.customer_no diff --git a/src/main/resources/mapper/part/PartMapper.xml b/src/main/resources/mapper/part/PartMapper.xml index cd527a7..987023d 100644 --- a/src/main/resources/mapper/part/PartMapper.xml +++ b/src/main/resources/mapper/part/PartMapper.xml @@ -91,7 +91,8 @@ wu.um_name as weightUmName, print_str1, print_str2, - print_str3 + print_str3, + p.roll_label_flag from part p left join unit u on p.um_id = u.um_id left join unit wu on p.weight_um_id = wu.um_id