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

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

@@ -19,7 +19,7 @@ public class AndonEnumUtil {
     public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
         INNER(10, "内部处理"),
         OUTER(20, "外部处理"),
-        REVIEW(30, "人工审核");
+        REVIEW(30, "人工确认");
 
         private int value;
         private String description;

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

@@ -4509,7 +4509,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_ORDER_QUEUE_TYPE {
         PRODUCT_QUEUE(10, "生产队列"),
-        PRELOAD_QUEUE(20, "预装队列");
+        PRELOAD_QUEUE(20, "预装队列"),
+        FIRST_STATION_QUEUE(30, "首工位队列");
 
         private int value;
         private String description;
@@ -6147,4 +6148,50 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 盲检类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOPIC_TYPE {
+        COLOUR(10, "颜色"),
+        GRADE(20, "等级"),
+        TO_CONFIGURE(30, "配置");
+
+        private int value;
+        private String description;
+
+        TOPIC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -374,7 +374,7 @@ public class MesPcnEnumUtil {
         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包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
         private String value;
         private String description;
 
@@ -612,6 +612,16 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
+        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 MES_MATCH_TYPE getByValue(int value) {
             for (MES_MATCH_TYPE mesMatchType : values()) {
                 if (mesMatchType.getValue() == value) {
@@ -4007,4 +4017,86 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 生产异常操作记录
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_ERROR_RECORD {
+        JUMP_PROCESS(10, "跳过工序"),
+        JUMP_STEP(20, "跳过工步"),
+        JUMP_STATE(30, "跳过状态点");
+
+        private int value;
+        private String description;
+
+        PRODUCE_ERROR_RECORD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 盲检类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOPIC_TYPE {
+        COLOUR(10, "零件颜色"),
+        GRADE(20, "等级"),
+        TO_CONFIGURE(30, "配置");
+
+        private int value;
+        private String description;
+
+        TOPIC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -14,6 +14,83 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_
 public class PtlPcnEnumUtil {
 
     /**
+     * 状态机异常处理方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
+        INNER(10, "内部处理"),
+        OUTER(20, "外部处理"),
+        REVIEW(30, "人工确认");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
+        TRUE(10, "已处理"),
+        FALSE(20, "未处理");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常缓存标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
+        FALSE(10, "否"),
+        TRUE(20, "是"),
+        ORIGINAL(30, "原先");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 控制器状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -531,4 +531,119 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 移库单业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_BUSI_TYPE {
+        PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
+        CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
+        OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
+        ALLOCATION(40, "ALLOCATION", "调拨"),
+        SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
+        SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
+        NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
+        SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
+        CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
+        PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
+        INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
+        SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
+        RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
+        OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
+        NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
+        SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
+        NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
+        ASN(200, "ASN", "ASN"),
+        PO(210, "PO", "PO"),
+        QC(220, "QC", "QC"),
+        AMPR(230, "AMPR", "AMPR"),
+        FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
+        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
+        VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
+        VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
+        VDA_QC(290, "VDA_QC", "VDA质检"),
+        VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
+        VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
+        KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
+        KT_SCRAP(330, "KT_SCRAP", "KT报废"),
+        KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
+        KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
+        KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
+        KT_RETURN(370, "KT_RETURN", "KT退货"),
+        KT_REWORK(380, "KT_REWORK", "KT返工"),
+        KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
+        KT_SORTING(400, "KT_SORTING", "KT分选"),
+        VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
+        VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
+        KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
+        VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
+        KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
+        KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
+        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
+        KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
+        PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
+        UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
+        LOADING_ORDER(530, "LOADING_ORDER", "装车单");
+        private int value;
+        private String code;
+        private String description;
+
+        OUT_MOVEMENT_BUSI_TYPE(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 codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -6456,7 +6456,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FG_INSTOCK_SN_TYPE {
-        NORMAL(10, "NORMAL", "实物条码(正常)"),
+        NORMAL(10, "NORMAL", "正常"),
         FIRST_PIECE(20, "FIRST_PIECE", "首件"),
         MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
         TAIL_PIECE(40, "TAIL_PIECE", "末件");
@@ -6976,8 +6976,8 @@ 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", "审批拒绝");
+        APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"),
+        APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回");
 
         private int value;
         private String code;
@@ -7397,4 +7397,79 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 库位利用率
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_PROPORTION {
+        ZERO(10, "ZERO", "0%"),
+        GENERAL(20, "GENERAL", "0%-30%"),
+        MEDIUM(30, "MEDIUM", "30%-60%"),
+        WELL(40, "WELL", "60%-100%");
+
+        private int value;
+        private String code;
+        private String description;
+
+        LOCATE_PROPORTION(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 LOCATE_PROPORTION 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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java

@@ -103,4 +103,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型")
     private String snType;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam("客户发往地")
+    private String shippingFlag;
 }

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

@@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("主队列编号")
+    private String orderNo;
+
 }

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

@@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable {
     private Integer topicType;
 
     @Column(name = "QTY")
-    @ApiParam("答案数量")
+    @ApiParam("错误答案数量")
     private Integer qty;
 
     @Column(name = "WORK_CELL_CODE")

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

@@ -53,4 +53,8 @@ public class MesCustomer extends BaseBean implements Serializable {
     @Column(name = "TELEPHONE")
     @ApiParam("客户电话")
     private String telephone;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam("客户发往地")
+    private String shippingFlag;
 }

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

@@ -114,6 +114,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("条码类型")
     private String snType;
 
+    @Transient
+    @ApiParam("客户发往地")
+    private String shippingFlag;
+
     public MesPackage() {
     }
 

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/28 14:32
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PRODUCE_ERROR_RECORD")
+@Api("生产异常操作记录")
+public class MesProduceErrorRecord extends BaseBean {
+    private static final long serialVersionUID = 209753108845613052L;
+
+    @Column(name = "ERROR_TYPE")
+    @ApiParam("异常类型 10:工序跳过 20:工步跳过")
+    private Integer errorType;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态点代码")
+    private String statusCode;
+
+
+}

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

@@ -160,6 +160,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("年度型")
     private String modelYear;
 
+    @Transient
+    @ApiParam("主队列状态")
+    private Integer masterStatus;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -186,8 +190,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     }
 
     public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
-                            Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                            String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java

@@ -82,6 +82,12 @@ public class GenSerialNoModel {
     @ApiParam("当前编号")
     private String currentNumber;
 
+    @ApiParam("物料类型3")
+    private String categoryCode3;
+
+    @ApiParam("零件号后4位")
+    private String partNoAfterFour;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java

@@ -32,4 +32,8 @@ public class MesBlindProbleModel extends BaseBean {
 
     @ApiParam(value = "正确答案")
     private String rightKey;
+
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceErrorRecordRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceErrorRecord;
+
+/**
+ * @Description :IF_JIT发运数据
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesProduceErrorRecordRepository extends BaseRepository<MesProduceErrorRecord, Long> {
+}

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

@@ -2888,28 +2888,29 @@ public class MesHqlPack {
         return result;
     }
 
-//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
-//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
-//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
-//        return packBean;
-//    }
-
-//    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
-//        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
-//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
-//        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
-//        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
-//        return packBean;
-//    }
+    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
+        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
+        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 
     /**
      * MES 校枪记录

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-02 9:27
+ * @Modify:
+ **/
+@Data
+public class WmsLocateModel implements Serializable {
+
+    private static final long serialVersionUID = 2433931236774158401L;
+
+    @ApiParam(value = "箱数")
+    public Long snBoxQty;
+
+    @ApiParam(value = "最大包装数量")
+    public Integer maxPackageQty;
+
+    @ApiParam(value = "库位利用率值")
+    public Double proportionValue;
+
+    @ApiParam(value = "库位代码")
+    public String locateNo;
+
+    @ApiParam(value = "库位名称")
+    public String locateName;
+
+    @ApiParam(value = "存储区代码")
+    public String zoneNo;
+
+    @ApiParam(value = "存储区名称")
+    public String zoneName;
+
+    @ApiParam(value = "仓库代码")
+    public String whNo;
+
+    @ApiParam(value = "仓库名称")
+    public String whNoName;
+
+    @ApiParam(value = "组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "库位利用率")
+    public Integer proportion;
+
+    public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue,
+                          String locateNo, String locateName, String zoneNo,
+                          String zoneName, String whNo, String whNoName, String organizeCode) {
+        this.snBoxQty = snBoxQty;
+        this.maxPackageQty = maxPackageQty;
+        this.proportionValue = proportionValue;
+        this.locateNo = locateNo;
+        this.locateName = locateName;
+        this.zoneNo = zoneNo;
+        this.zoneName = zoneName;
+        this.whNo = whNo;
+        this.whNoName = whNoName;
+        this.organizeCode = organizeCode;
+    }
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java

@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -56,9 +55,16 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable
     @ApiParam(value = "缓存标识")
     private Integer cacheFlag;
 
-    @Lob
-    @Column(name = "CONTENT")
-    @ApiParam(value = "内容")
-    private String content;
+    @Column(name = "CACHE_KEY")
+    @ApiParam(value = "缓存KEY")
+    private String cacheKey;
+
+    @Column(name = "HANDLE_TYPE")
+    @ApiParam(value = "处理方式")
+    private Integer handleType;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
 
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -48,7 +48,10 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("外部触发事件")
     private String triggerEvent;
 
-    @ApiModelProperty("流程类型")
-    private Integer routeType;
+    @ApiModelProperty("缓存KEY")
+    private String cacheKey;
+
+    @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
+    private boolean errorInnerAction = false;
 
 }

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

@@ -142,4 +142,8 @@ public class SwebDocMovementMaster extends BaseBean {
     @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     private String srcZoneNo;
+
+    @Column(name = "SHIP_TIME")
+    @ApiParam(value = "发运时间")
+    private String shipTime;
 }

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

@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SWEB_MOVEMENT_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class SwebMovementToWms extends BaseBean {
+    private static final long serialVersionUID = -8089219927352225317L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

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

@@ -0,0 +1,97 @@
+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-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SWEB_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class SwebPoToWms extends BaseBean {
+
+    private static final long serialVersionUID = -3999194389200855165L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    private Double qty;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商")
+    private String vendorNo;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "0")
+    private Double printQty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Column(name = "ERP_AREA_NO")
+    @ApiParam("默认收货库存地")
+    private String erpAreaNo;
+
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @ApiParam("标准包装")
+    private Double snp;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

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

@@ -68,9 +68,9 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "序列号")
     private String serialNo;
 
-    @Column(name = "BAR_CODE")
+    @Column(name = "SN")
     @ApiParam(value = "箱条码")
-    private String barCode;
+    private String sn;
 
     @Column(name = "ERP_WAREHOUSE")
     @ApiParam("库存地")

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_MOVEMENT_TO_SWEB")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToSweb extends BaseBean {
+    private static final long serialVersionUID = 49215041475324487L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

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

@@ -0,0 +1,46 @@
+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-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_SWEB")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToSweb extends BaseBean {
+    private static final long serialVersionUID = 4710841067412420270L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+}

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

@@ -61,4 +61,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @Transient
     @ApiParam(value = "是否可编辑（前端使用）")
     public boolean isSet = false;
+
+    @Transient
+    @ApiParam(value = "预计到货日期")
+    public String expectedTime;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.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.SwebMovementToWms;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebMovementToWmsRepository extends BaseRepository<SwebMovementToWms, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.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.SwebPoToWms;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebPoToWmsRepository extends BaseRepository<SwebPoToWms, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.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.WmsMovementToSweb;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.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.WmsPoToSweb;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsPoToSwebRepository extends BaseRepository<WmsPoToSweb, Long> {
+}

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
 import org.apache.commons.lang3.StringUtils;
@@ -48,8 +49,10 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
-        DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
-                purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
+        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
+            DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
+                    purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
+        }
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(purchaseOrder, result);
@@ -183,6 +186,8 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
         DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(details, result);

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

@@ -41,7 +41,7 @@ public class QmsStockSnExtBh extends BaseBean {
 
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient

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

@@ -1,8 +1,10 @@
 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;
@@ -84,6 +86,7 @@ public class WmsAreaOwner extends BaseBean {
     @Column(name = "IS_PRE_ASSIGN")
     @ApiParam(value = "是否预分配人员")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
     private Integer isPreAssign;
 
     @Column(name="SHIFT_NO")

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

@@ -175,6 +175,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     private Integer destBoxQty;
 
     @Transient
+    @ApiParam(value = "库位利用率")
+    public Integer proportion;
+
+    @Transient
     @ApiParam(value = "错误信息", example = "-1")
     private String errorMsg;
 

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

@@ -56,7 +56,7 @@ public class WmsLogisticExpenseRecords extends BaseBean {
 
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输方式")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transportType;
 

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

@@ -43,6 +43,11 @@ public class WmsLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String placeOfOrigin;
 
+    @Column(name = "DESTINATION_WAREHOUSE")
+    @ApiParam(value = "目的仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String destinationWarehouse;
+
     @Column(name = "SHIPPING_FLAG")
     @ApiParam(value = "发往地")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
@@ -60,7 +65,7 @@ public class WmsLogisticsCosts extends BaseBean {
 
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;
 

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

@@ -71,7 +71,7 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     private String logisticsVendorNo;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输方式")
+    @ApiParam(value = "运输类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
     private Integer transportType;
@@ -99,11 +99,12 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     @Column(name = "is_urgent")
     @ApiParam(value = "是否紧急")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isUrgent;
 
     public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
         this.orderNo = docMovementMaster.getOrderNo();
+        this.organizeCode = docMovementMaster.getOrganizeCode();
         this.busiType = docMovementMaster.getBusiType();
         this.organizeCode = docMovementMaster.getOrganizeCode();
         this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();

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

@@ -51,4 +51,9 @@ public class WmsProviderFlag extends BaseBean {
     @ApiParam(value = "发往地编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
+
+    @Column(name = "SHIPPING_FLAG_NAME")
+    @ApiParam(value = "发往地编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlagName;
 }

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

@@ -58,6 +58,11 @@ public class WmsShortLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
+    @Column(name = "DESTINATION_WAREHOUSE")
+    @ApiParam(value = "目的仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String destinationWarehouse;
+
     @Column(name = "LOGISTICS_VENDOR_NO")
     @ApiParam(value = "物流供应商")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存初始化表
@@ -114,4 +115,13 @@ public class WmsStockInitialize extends BaseBean {
     @AnnoOutputColumn(required = false)
     private Integer seqNo;
 
+    @Transient
+    @ApiParam(value = "确认标志")
+    private boolean confirm;
+
+
+    @Transient
+    @ApiParam(value = "物料-1，器具-2")
+    public String intiType;
+
 }

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

@@ -426,6 +426,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient

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

@@ -82,6 +82,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Transient
     @ApiParam("BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient