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

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

@@ -9594,6 +9594,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRAP_TYPE {
+        NORMAL_SCRAP(0, "NORMAL", "生产报废"),
         ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
         AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
 

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

@@ -158,6 +158,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("维修名称")
     private String repairName;
 
+    @Column(name = "SPEC_CODE")
+    @ApiParam("包装代码")
+    private String specCode;
+
     @Transient
     @ApiParam(value = "完成状态")
     public Integer orderStatus;
@@ -424,6 +428,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
     public Integer scrapType;
 
+    @Transient
+    @ApiParam("报废类型名字")
+    public String scrapTypeName;
+
 
 
     public String getRecommondLot() {