Merge remote-tracking branch 'origin/ext-dev' into ext-dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -263,6 +263,11 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("班次代码")
     private String shiftCode;
 
+    @ApiParam("变更号")
+    @Column(name = "PART_LOT_NO")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partLotNo;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java

@@ -73,7 +73,7 @@ public class WmsVendorPart extends BaseBean {
 
     @Column(name = "GRADE")
     @ApiParam("加严")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private String grade;
 
     @Column(name = "REMARK")