BH 需求变更-增加产品条码信息

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : 产品条码信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-05-23 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_SERIAL_SN", indexes = {
+        @Index(columnList = "BATCH_NO"),
+        @Index(columnList = "STOCK_SN"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SERIAL_SN")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "产品条码信息", description = "产品条码信息")
+public class WmsSerialSn extends BaseBean {
+
+    private static final long serialVersionUID = -2540413299274882785L;
+
+    @Column(name = "BATCH_NO")
+    @ApiParam(value = "BATCH号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String batchNo;
+
+    @Column(name = "STOCK_SN")
+    @ApiParam(value = "库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String stockSn;
+
+    @Column(name = "SERIAL_SN")
+    @ApiParam(value = "产品条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String serialSn;
+
+    @Column(name = "SRC_STOCK_SN")
+    @ApiParam(value = "源库存条码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String srcStockSn;
+
+    @Column(name = "BH_TYPE")
+    @ApiParam(value = "BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
+    private String bhType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
+            searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
+    private String partNameRdd;
+
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double qty;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DIRECTION_TYPE {
-        SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
-        WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
-        MES2WMS(30, "MES2WMS", "MES --> WMS"),
-        WMS2MES(40, "WMS2MES", "WMS --> MES");
+        SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"),
+        WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"),
+        MES2WMS(30, "MES2WMS-2", "MES --> WMS"),
+        WMS2MES(40, "WMS2MES-2", "WMS --> MES");
 
         private int value;
         private String name;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 产品条码信息dao层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-05-23 11:00
+ * @Modify:
+ **/
+@Repository
+public interface WmsSerialSnRepository extends BaseRepository<WmsSerialSn, Long> {
+}