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

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -705,7 +705,8 @@ public class MesEnumUtil {
         BOARD("BOARD", "看板类型"),
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
-        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
+        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
 
         private String value;
         private String description;

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

@@ -369,8 +369,12 @@ public class MesPcnEnumUtil {
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
-        WC_CHECK("WC_CHECK", "开线检查项");
-
+        WC_CHECK("WC_CHECK", "开线检查项"),
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
+        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
         private String value;
         private String description;
 

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

@@ -6505,8 +6505,9 @@ public class WmsEnumUtil {
     public enum REWORK_STATUS {
         INIT(10, "INIT", "初始化"),
         BE_HANDLE(20, "BE_HANDLE", "待处理"),
-        FINISH(30, "FINISH", "已处理"),
-        NONE(40, "NONE", "不处理");
+        HANDLING(30, "HANDLING", "处理中"),
+        FINISH(40, "FINISH", "已处理"),
+        NONE(50, "NONE", "不处理");
 
         private int value;
         private String code;
@@ -6970,6 +6971,154 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 运费单审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum APPROVAL_STATUS {
+        APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"),
+        APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "已审批"),
+        APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝");
+
+        private int value;
+        private String code;
+        private String description;
+
+        APPROVAL_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static APPROVAL_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 运费单审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NORMAL_ABNORMAL {
+        NORMAL(10, "NORMAL", "正常"),
+        ABNORMAL(20, "ABNORMAL", "非正常");
+
+        private int value;
+        private String code;
+        private String description;
+
+        NORMAL_ABNORMAL(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static NORMAL_ABNORMAL codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
      * 产品条码事务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -7166,4 +7315,86 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * BH处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_WORK_STATUS {
+        WAIT_CHECK(10, "WAIT_CHECK", "待检验"),
+        SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"),
+        IN_CHECK(30, "IN_CHECK", "检验中"),
+        WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"),
+        WAIT_REPARI(50, "WAIT_OUT", "待返修"),
+        WAIT_PICK(60, "WAIT_OUT", "待挑选"),
+        IN_REPARI(70, "WAIT_OUT", "返修中"),
+        IN_PICK(80, "WAIT_OUT", "挑选中"),
+        WAIT_OUT(90, "WAIT_OUT", "待出库"),
+        OUT(100, "WAIT_OUT", "已出库");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_WORK_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static BH_WORK_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java

@@ -99,4 +99,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CT_NO")
     @ApiParam("容器编号")
     private String ctNo;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -110,6 +110,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("容器编号")
     private String ctNo;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -480,4 +480,65 @@ public class MesPcnHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getProdBindRecord(MesProdBindRecord prodBindRecord) {
+        DdlPackBean packBean = getAllBaseData(prodBindRecord.getOrganizeCode());
+        if (!StringUtils.isEmpty(prodBindRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(prodBindRecord.getSerialNumber(), "serialNumber", packBean);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getProductData(MesProductData productData) {
+        DdlPackBean packBean = getAllBaseData(productData.getOrganizeCode());
+        if (!StringUtils.isEmpty(productData.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(productData.getSerialNumber(), "serialNumber", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES工作中心信息查询条件封装
+     *
+     * @param mesWorkCenter
+     * @return
+     */
+    public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES工作单元信息查询条件封装
+     *
+     * @param mesWorkCell
+     * @return
+     */
+    public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
+        if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean);
+        }
+
+        return packBean;
+    }
+
 }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -0,0 +1,154 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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.Table;
+import javax.persistence.Version;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_DETAILS")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-明细")
+public class SwebDocMovementDetails extends BaseBean {
+    private static final long serialVersionUID = -1232334350341792942L;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目的库存地代码")
+    public String destAreaNo;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name = "IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    private Integer itemStatus;
+
+    @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已拣货数量", example = "1")
+    private Double pickQty;
+
+    @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已出库数量", example = "1")
+    private Double outQty;
+
+    @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已收货数量", example = "1")
+    private Double recQty;
+
+    @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam(value = "计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "1")
+    private Double printQty;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "操作原因")
+    private String remark;
+
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("源库存地代码")
+    public String srcAreaNo;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name = "SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码生成状态", example = "20")
+    public Integer isSn;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    public String lotNo;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java

@@ -0,0 +1,141 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_MASTER")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-主表")
+public class SwebDocMovementMaster extends BaseBean {
+
+    private static final long serialVersionUID = -4539662053206835169L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public String busiType;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    @Column(name = "IS_TASK")
+    @ApiParam(value = "是否生产任务", example = "1")
+    public Integer isTask;
+
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件", example = "1")
+    private Integer isPart;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+    /**
+     * 状态:0=新建,10=处理中
+     * ,20=已完成,90=已关闭,91=已取消
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    @Column(name = "PRIORITY")
+    @ApiParam(value = "优先级", example = "1")
+    public Integer priority;
+
+    /**
+     * 关联单据类型:1=ASN,10=PO,20=SO
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "关联单据")
+    private String refNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    private Integer version;
+
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name = "PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer isSn;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目的仓库代码")
+    private String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目的存储区代码")
+    private String destZoneNo;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    private String srcWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    private String srcZoneNo;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_DOC_MOVEMENT_SN")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("移库单-条码")
+public class SwebDocMovementSn extends BaseBean {
+
+    private static final long serialVersionUID = -8545031740048178867L;
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 状态：操作状态  itemStatus
+     */
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "操作状态", example = "10")
+    public Integer snStatus;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam(value = "条码类型")
+    private Integer snType;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebMovementModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class SwebMovementModel {
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "需求数量")
+    private Double qty;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementDetailsRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementDetails;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementDetailsRepository extends BaseRepository<SwebDocMovementDetails, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementMasterRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementMasterRepository extends BaseRepository<SwebDocMovementMaster, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebDocMovementSnRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebDocMovementSn;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebDocMovementSnRepository extends BaseRepository<SwebDocMovementSn, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -171,4 +171,18 @@ public class SwebHqlPack {
         DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
         return buildHql(details, result);
     }
+
+    public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(master, result);
+    }
+
+    public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(details, result);
+    }
 }

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : BH库存条码扩展表
@@ -27,7 +28,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="QMS_STOCK_SN_EXT_BH")
-@Api("BH检测大类表")
+@Api("BH库存条码扩展表")
 public class QmsStockSnExtBh extends BaseBean {
 
     @Column(name="sn")
@@ -43,4 +44,83 @@ public class QmsStockSnExtBh extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
     private Integer bhType;
 
+    @Transient
+    @ApiParam("处理状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer workStatus;
+
+    /*****汇总查询结果信息****/
+    @Transient
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Transient
+    @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isQualified;
+
+
+    @Transient
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Transient
+    @ApiParam("返修结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer reworkResult;
+
+    @Transient
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickStatus;
+
+    @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
+    @Transient
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Transient
+    @ApiParam("客户发往地")
+    public String flagNo;
+
+
+
+    @Transient
+    @ApiParam("二维码")
+    public String serialSn;
+
+
+    public QmsStockSnExtBh(String organizeCode, String bhCode,
+                           String workCenterCode, String partNo,
+                           String partName, String flagNo, Integer isQualified,
+                           Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) {
+        this.organizeCode = organizeCode;
+        this.batchNo = bhCode;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.flagNo = flagNo;
+        this.isQualified = isQualified;
+        this.reworkStatus = reworkStatus;
+        this.reworkResult = reworkResult;
+        this.pickStatus = pickStatus;
+        this.pickResult = pickResult;
+        this.bhType = bhType;
+    }
+
+    public QmsStockSnExtBh(String batchNo, Integer bhType) {
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+    }
+    public QmsStockSnExtBh() {
+    }
+
 }

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

@@ -1,7 +1,9 @@
 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;
@@ -210,6 +212,41 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号组")
     public String[] partNos;
 
+    @ApiParam("是否正常运输")
+    @Column(name = "IS_NORMAL_TRANSPORTATION")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isNormalTransportation;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
+    private Integer transportType;
+
+    @Column(name = "LOGISTICS_VENDOR_NO")
+    @ApiParam("物流供应商")
+    private String logisticsVendorNo;
+
+    //正常运输 和非正常运输
+    @Column(name = "BUSINESS_TYPE")
+    @ApiParam(value = "业务类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
+    private Integer businessType;
+
+    @Column(name = "IS_TRANSPORTATION_CREATION")
+    @ApiParam(value = "运输信息创建")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isTransportationCreation;
+
+    @Column(name = "IS_GOOD_PRODUCT")
+    @ApiParam(value = "运输信息创建")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isGoodProduct;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -0,0 +1,89 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 物流费用记录
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-05-15 3:18 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用记录")
+public class WmsLogisticExpenseRecords extends BaseBean {
+    private static final long serialVersionUID = 6512855224667052310L;
+
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlag;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer transportType;
+
+    @Column(name = "sum")
+    @ApiParam(value = "总运输费用")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double sum;
+
+    @Column(name = "LOGISTICS_VENDOR_NO")
+    @ApiParam(value = "物流供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String logisticsVendorNo;
+
+    @Transient
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class)
+    public Integer orderStatus;
+
+    public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
+//        this.organizeName = docMovementMaster.getorganizeName;
+        this.orderNo = docMovementMaster.getOrderNo();
+        this.shippingFlag = docMovementMaster.getFlagNo();
+        this.busiType = docMovementMaster.getBusiType();
+        this.transportType = docMovementMaster.getTransportType();
+        this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
+    }
+
+    public WmsLogisticExpenseRecords() {
+    }
+}

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

@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 物流费用记录明细
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-05-15 3:18 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS_DETAILS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用记录明细")
+public class WmsLogisticExpenseRecordsDetails extends BaseBean {
+
+    private static final long serialVersionUID = -6839107270239441520L;
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
+    @Column(name = "unit")
+    @ApiParam(value = "计量单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double qty;
+
+    @Column(name = "COST")
+    @ApiParam(value = "总运输费用")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double cost;
+
+    @Column(name = "START_TIME")
+    @ApiParam(value = "开始时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam(value = "结束时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String endTime;
+
+
+}

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

@@ -29,7 +29,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value = "物流费用管理", description = "物流费用管理")
+@Api(value = "物流费用管理")
 public class WmsLogisticsCosts extends BaseBean {
 
     private static final long serialVersionUID = -5307311210847854654L;
@@ -59,9 +59,9 @@ public class WmsLogisticsCosts extends BaseBean {
     private String salesUnit;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输方式")
+    @ApiParam(value = "运输类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;
 
     @Column(name = "price")
@@ -78,4 +78,5 @@ public class WmsLogisticsCosts extends BaseBean {
     @ApiParam(value = "结束日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endDate;
+
 }

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

@@ -0,0 +1,125 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 物流运费审批
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-05-14 11:41 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL")
+@Api("物流运费审批")
+public class WmsLogisticsFreightApproval extends BaseBean {
+    private static final long serialVersionUID = -1385266737512278984L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("单据类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class)
+    private Integer busiType;
+
+    @Column(name = "APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "APPROVAL_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.APPROVAL_STATUS.class)
+    private Integer approvalStatus;
+
+    @Column(name = "SUPPLY_WAREHOUSE")
+    @ApiParam("供货仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String supplyWarehouse;
+
+    @Column(name = "DEMAND_WAREHOUSE")
+    @ApiParam("需求仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String demandWarehouse;
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String custNo;
+
+    @Column(name = "LOGISTICS_VENDOR_NO")
+    @ApiParam("物流供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String logisticsVendorNo;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
+    private Integer transportType;
+
+    @Column(name = "PLACE_OF_ORIGIN_CODE")
+    @ApiParam(value = "客户发出地代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String placeOfOriginCode;
+
+    @Column(name = "PLACE_OF_ORIGIN_DESC")
+    @ApiParam(value = "客户发出地描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String placeOfOriginDesc;
+
+    @Column(name = "CUST_DELIVERY_CODE")
+    @ApiParam(value = "客户发往地代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String custDeliveryCode;
+
+    @Column(name = "CUST_DELIVERY_DESC")
+    @ApiParam(value = "客户发往地描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String custDeliveryDesc;
+
+    @Column(name = "is_urgent")
+    @ApiParam(value = "是否紧急")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Integer isUrgent;
+
+    public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
+        this.orderNo = docMovementMaster.getOrderNo();
+        this.busiType = docMovementMaster.getBusiType();
+        this.organizeCode = docMovementMaster.getOrganizeCode();
+        this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();
+        this.supplyWarehouse = docMovementMaster.getAssignSrcWhNo();
+        this.demandWarehouse = docMovementMaster.getAssignDestWhNo();
+        this.custNo = docMovementMaster.getCustNo();
+        this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
+        this.transportType = docMovementMaster.getTransportType();
+        this.placeOfOriginCode = docMovementMaster.getFlagNo();
+//        this.placeOfOriginDesc = placeOfOriginDesc;
+        this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
+//        this.custDeliveryDesc = custDeliveryDesc;
+        this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+    }
+
+    public WmsLogisticsFreightApproval() {
+
+    }
+}

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

@@ -88,4 +88,21 @@ public class WmsSerialSn extends BaseBean {
     @ApiParam(value = "数量", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
+
+    public WmsSerialSn() {
+
+    }
+
+    public WmsSerialSn(String organizeCode, String batchNo, String stockSn, String partNo, String partNameRdd, String serialSn, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = batchNo;
+        this.stockSn = stockSn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.serialSn = serialSn;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -29,7 +29,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value = "物流费用管理", description = "物流费用管理")
+@Api(value = "物流费用管理")
 public class WmsShortLogisticsCosts extends BaseBean {
 
     private static final long serialVersionUID = 733863151632950809L;
@@ -64,9 +64,9 @@ public class WmsShortLogisticsCosts extends BaseBean {
     private String logisticsVendorNo;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输方式")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    @ApiParam(value = "运输类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;
 
     @Column(name = "SALES_UNIT")

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

@@ -416,6 +416,47 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("样本数")
     private Integer sampleSize;
 
+    @Transient
+    @ApiParam("BATCH号")
+    private String batchNo;
+
+    @Transient
+    @ApiParam(value = "产品条码")
+    private String serialSn;
+
+    @Transient
+    @ApiParam("BH类型")
+    private Integer bhType;
+
+    @Transient
+    @ApiParam("处理状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer workStatus;
+
+    @Transient
+    @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isQualified;
+
+    @Transient
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Transient
+    @ApiParam("返修结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer reworkResult;
+
+    @Transient
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickStatus;
+
+    @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
     public WmsStockSn() {
     }
 
@@ -594,6 +635,7 @@ public class WmsStockSn extends BaseBean {
 
 
     public WmsStockSn(WmsStockSn stockSn, String batchCode) {
+        this.id = stockSn.getId();
         this.organizeCode = stockSn.getOrganizeCode();
         this.refSrc = stockSn.getRefSrc();
         this.partNo = stockSn.getPartNo();
@@ -616,4 +658,40 @@ public class WmsStockSn extends BaseBean {
         this.refSrc = batchCode;
     }
 
+    public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo,
+                      String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime,
+                      String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = partNo;
+        this.sn = sn;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.shippingFlag = shippingFlag;
+        this.leftCode = leftCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+
+    }
+
+    public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
+                      String partNameRdd, String workCenterCode, String createUser, String createDatetime,
+                      String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+
+    }
+
+
 }

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

@@ -74,6 +74,10 @@ public class WmsTestResultDetails extends BaseBean {
     @ApiParam("已检测数")
     private Long checkSize;
 
+    @Transient
+    @ApiParam("移动单单号")
+    private String moveNo;
+
     public WmsTestResultDetails() {
     }
 

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

@@ -84,6 +84,31 @@ public class WmsTestResultSummary extends BaseBean {
     @ApiParam("BH类型")
     private Integer bhType;
 
+    @Transient
+    @ApiParam("库存条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("库存条码二维码")
+    private String serialSn;
+
+    public WmsTestResultSummary(String organizeCode, String bhCode,
+                                String workCenterCode, String partNo,
+                                String partName, String flagNo, Integer isQualified,
+                                Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult) {
+        this.organizeCode = organizeCode;
+        this.bhCode = bhCode;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.flagNo = flagNo;
+        this.isQualified = isQualified;
+        this.reworkStatus = reworkStatus;
+        this.reworkResult = reworkResult;
+        this.pickStatus = pickStatus;
+        this.pickResult = pickResult;
+    }
+
     public WmsTestResultSummary(String organizeCode, String bhCode,
                                 String workCenterCode, String partNo,
                                 String partName, String flagNo, Integer isQualified,
@@ -100,7 +125,6 @@ public class WmsTestResultSummary extends BaseBean {
         this.pickStatus = pickStatus;
         this.pickResult = pickResult;
         this.bhType = bhType;
-
     }
 
     public WmsTestResultSummary() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsDetailsRepository.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.WmsLogisticExpenseRecordsDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流运费记录明细
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsLogisticExpenseRecordsDetailsRepository extends BaseRepository<WmsLogisticExpenseRecordsDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticExpenseRecordsRepository.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.WmsLogisticExpenseRecords;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流运费记录
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsLogisticExpenseRecordsRepository extends BaseRepository<WmsLogisticExpenseRecords, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsFreightApprovalRepository.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.WmsLogisticsFreightApproval;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流运费审批
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-05-14 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsLogisticsFreightApprovalRepository extends BaseRepository<WmsLogisticsFreightApproval, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3321,6 +3321,39 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 物流运费记录明细查询条件
+     *
+     * @param logisticExpenseRecordsDetails 物流运费记录明细
+     * @return
+     */
+    public static DdlPackBean packHqlLogisticExpenseRecordsDetails(WmsLogisticExpenseRecordsDetails logisticExpenseRecordsDetails) {
+        DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecordsDetails.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(logisticExpenseRecordsDetails.getPartName(), "partName", result);
+        DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getOrderNo(), "orderNo", result);
+        getStringBuilderPack(logisticExpenseRecordsDetails, result);
+        return result;
+    }
+
+    /**
+     * 物流运费记录查询条件
+     *
+     * @param logisticExpenseRecords 物流运费记录
+     * @return
+     */
+    public static DdlPackBean packHqlLogisticExpenseRecords(WmsLogisticExpenseRecords logisticExpenseRecords) {
+        DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecords.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getLogisticsVendorNo(), "logisticsVendorNo", result);
+        DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getTransportType(), "transportType", result);
+        DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getBusiType(), "busiType", result);
+        DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getShippingFlag(), "shippingFlag", result);
+        DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getOrderNo(), "orderNo", result);
+        getStringBuilderPack(logisticExpenseRecords, result);
+        return result;
+    }
+
+
 
     /**
      * 产品条码事务查询条件

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>