冲突

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

@@ -893,7 +893,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理");
+        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
 
         private int value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -29,4 +29,13 @@ public class TransSnModle extends BaseComponetsParam{
     @ApiParam(value = "分组编号")
     public String packageNo;
 
+    /**
+     * 针对抽点
+     */
+    public double cpQty;
+
+    /**
+     * 供应商批次
+     */
+    public String dateCode;
 }

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

@@ -29,6 +29,14 @@ import javax.persistence.Transient;
 @Api("抽点记录信息")
 public class WmsCheckFactRecord extends BaseBean {
 
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单据编号")
+    private String refSrc;
+
     @Column(name="PO_NO")
     @ApiParam("采购单号")
     public String poNo;

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

@@ -55,7 +55,7 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态:10 = 创建，20 = 已打印，30 = 已收货
+     * 状态:同库存条码状态一致
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "状态", example = "10")