【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】

【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-22 19:46
+ * @Modify:
+ **/
+@Data
+public class WmsMoveDetailsBySnModel implements Serializable {
+
+    private static final long serialVersionUID = -3023644672955363786L;
+
+    @ApiParam("明细数据")
+    private List<WmsDocMovementDetails> detailsList;
+
+    @ApiParam("分页")
+    private Pager pager;
+}

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn;
 import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable {
 
     @ApiParam("打印条码")
     private List<WmsStockSn> wmsStockSnList;
+
+    @ApiParam("单据条码")
+    private List<WmsPoSn> wmsPoSnList;
 }

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

@@ -18,7 +18,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 
 /**
- * @Description : 包材BOM信息
+ * @Description : QAD_BOP信息
  * @Reference :
  * @Author : jimmy.zeng
  * @CreateDate : 2020-01-09 14:40
@@ -29,7 +29,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @Table(name="QAD_BOP")
-@Api("包材BOM信息")
+@Api("QAD_BOP信息")
 public class QadBop  implements Serializable {
 
     private static final long serialVersionUID = 4673217061075875734L;

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

@@ -0,0 +1,97 @@
+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.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : SOD_DET信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-22 16:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="SOD_DET")
+@Api("SOD_DET信息")
+public class SodDet implements Serializable {
+
+    private static final long serialVersionUID = 539607553249262854L;
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="COLUMN_GROUP")
+    @ApiParam("分组列名")
+    public String columnGroup;
+
+    @Column(name="COLUMN_GROUP_VALUE")
+    @ApiParam("分组列名值")
+    public String columnGroupValue;
+
+    @Column(name="PROPERTIES_NAME")
+    @ApiParam("参数名")
+    public String propertiesName;
+
+    @Column(name="PROPERTIES_VALUE")
+    @ApiParam("参数值")
+    public String propertiesValue;
+
+    @Column(name="table_name")
+    @ApiParam("表名")
+    public String tableName;
+
+    @Transient
+    private String dockcode;
+
+    @Transient
+    private String storagelocation;
+
+    @Transient
+    private String requerimentCode;
+}

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

@@ -245,6 +245,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
     private Integer executeStatus;
 
+    @Transient
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
+    @Transient
+    @ApiParam("执行")
+    private Integer isMakeUp;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }

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

@@ -127,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
 
-
     @Transient
     @ApiParam("打印模板")
     private String templateNo;
@@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("剩余箱数量")
     private Long countBox;
 
+    @Transient
+    private String dockcode;
+
+    @Transient
+    private String storagelocation;
+
+    @Transient
+    private String requerimentCode;
+
     public WmsDocMovementSn(){}
 
     public WmsDocMovementSn(Long countBox,String partNo) {

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

@@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "箱数")
     private Long boxQtys;
 
+    @Transient
+    private String dockcode;
+
+    @Transient
+    private String storagelocation;
+
+    @Transient
+    private String requerimentCode;
+
     public WmsStockSn() {
     }
 

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.QadBop;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description :
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop;
  * @CreateDate : 2020-01-09 15:06
  * @Modify:
  **/
+@Repository
 public interface QadBopRepository extends BaseRepository<QadBop, Long> {
 }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QadBop;
+import cn.estsh.i3plus.pojo.wms.bean.SodDet;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : SOD_DET信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 15:06
+ * @Modify:
+ **/
+@Repository
+public interface SodDetRepository extends BaseRepository<SodDet, Long> {
+}