16436 19081-PCN-返工返修-隔离-基于条码查询零件时-散件清单和物料bom，和增加物料名称查询条件

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java

@@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam("报废数")
     private Double wasteQty = 0d;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 
 
     public double getQtyVal() {

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java

@@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean {
     @Column(name = "REPAIR_NAME")
     @ApiParam("维修名称")
     private String repairName;
+
+    @Column(name = "IS_CANCEL_REPAIR")
+    @ApiParam("取消报废")
+    private Integer isCancelScrap;
 }