Jenkins自动合并

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

@@ -363,10 +363,10 @@ public class WmsEnumUtil {
     }
 
     /**
-     * PO条码状态
+     * 单据条码状态（PO/DOC_MOVE）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_SN_STATUS {
+    public enum ORDER_SN_STATUS {
         CREATE(10, "N", "创建"),
         RECEIPTED(20, "R", "已完成"),
         CANCEL(30, "C", "行取消"),
@@ -376,7 +376,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        PO_SN_STATUS(int value, String code, String description) {
+        ORDER_SN_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description SAP DB操作参数Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/1/2 11:23
+ * @Modify
+ */
+@Data
+public class WmsSapDbParamModel implements Serializable {
+    private static final long serialVersionUID = 5784492509251527816L;
+    private String organizeCode;//工厂代码
+    private String orderNo;//单号
+    private String partNo;//物料号
+    private String masterTableName;//单据主表名
+    private String masterStatusName;//单据状态名
+    private String detailsTableName;//单据明细表名
+    private String snTableName;//单据条码表名
+}

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

@@ -67,7 +67,7 @@ public class WmsDocMovementSn extends BaseBean {
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
     @Column(name="SN")