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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -7479,7 +7479,8 @@ public class WmsEnumUtil {
         PICK(40, "REPAIR", "挑选"),
         REPAIR(50, "REPAIR", "返修"),
         BIND(60, "BIND", "绑定"),
-        OUTSTOCK(70, "OUTSTOCK", "出库");
+        OUTSTOCK(70, "OUTSTOCK", "出库"),
+        RE_PACKING(80, "RE_PACKING", "重绑");
         private int value;
         private String code;
         private String description;

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

@@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name = "BATCH_NO")
     @ApiParam(value = "BATCH号")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String batchNo;
 
     @Column(name="SERIAL_SN")
@@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
     private Integer bhType;
 
     @Column(name = "PART_NO")
@@ -77,19 +77,26 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class)
     private Integer transType;
 
     @Column(name = "IS_OK")
     @ApiParam(value = "是否合格")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2)
     private Integer isOk;
 
     @Column(name = "LOT_NO")
     @ApiParam("生产批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lotNo;
 
+    @Column(name = "STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class)
+    @ApiParam("状态")
+    private Integer status;
+
     @Transient
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;