【合并冲突】

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java

@@ -85,27 +85,27 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     private Long alarmRouteId;
 
     @Transient
-    @ApiParam("默认不缓存")
+    @ApiParam("状态机异常时默认不缓存")
     private boolean cacheFlag = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("当前状态点的触发组件集默认未执行")
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发类型默认不需要外部触发")
+    @ApiParam("进入触发方法时默认不需要校验外部触发")
     private boolean checkTriggerTypeFalg = false;
 
     @Transient
-    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
     private String nextTriggerEvent;
 
     @Transient
-    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    @ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent")
     private boolean execNextModuleFlag = true;
 
     @Transient
-    @ApiParam("默认异常未处理")
+    @ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理")
     private boolean doErrorFlag = false;
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java

@@ -50,7 +50,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     public String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作中心")
+    @ApiParam(value = "工作单元")
     public String workCellCode;
 
     @Column(name = "ALARM_CODE")
@@ -65,9 +65,16 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     @ApiParam(value = "缓存标识")
     private Integer cacheFlag;
 
-    @Lob
+    @Column(name = "CACHE_KEY")
-    @Column(name = "CONTENT")
+    @ApiParam(value = "缓存KEY")
-    @ApiParam(value = "内容")
+    private String cacheKey;
-    private String content;
+
+    @Column(name = "HANDLE_TYPE")
+    @ApiParam(value = "处理方式")
+    private Integer handleType;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
 
 }

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

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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -97,6 +97,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean);
         if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }

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

@@ -13,6 +13,83 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态机异常处理方式
+     */
+    @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/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;

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;
 
@@ -2565,7 +2565,7 @@ public class MesPcnEnumUtil {
         CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
-        SHOW_ASSEMB_TABLE("SHOW_ASSEMB_TABLE", "展示组件表格");
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
 
         private String value;
         private String description;
@@ -3951,6 +3951,110 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(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);
+        }
+    }
+
+    /**
+     * 生产异常操作记录
+     */
+    @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)

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

@@ -14,14 +14,14 @@ public class PtlEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -73,17 +73,16 @@ public class PtlEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(30, "FINISH", "完成状态");
-        FINISH(40, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -654,14 +654,14 @@ public class PtlPcnEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -931,17 +931,16 @@ public class PtlPcnEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
+        FINISH(30, "FINISH", "完成状态");
-        FINISH(40, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"),
-        APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝");
+        APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回");
 
         private int value;
         private String code;

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/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/MesEsop.java

@@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("文件id")
     private Long fileId;
 
+    @Column(name = "ESOP_URL")
+    @ApiParam("文件路径")
+    private String esopUrl;
+
     @Transient
     @ApiParam("文件名称")
     private String fileName;
@@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("同步标记")
     private Integer syncTag = 0;
 
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 }

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "IF_PACKAGE_DETAIL")
+@Table(name = "MES_GUN_CALIBRATION_RECORD")
 @Api("校枪记录表")
 public class MesGunCalibrationRecord extends BaseBean implements Serializable {
 

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

@@ -190,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,
+                               Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                            String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               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/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,18 +2888,18 @@ public class MesHqlPack {
         return result;
     }
 
-    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
-        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
-        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
-        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
-        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
-        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
-        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
-        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
-        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
-        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
-        return packBean;
+//        return packBean;
-    }
+//    }
 
     public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
         DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());

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

@@ -100,6 +100,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("组合码")
     private String groupCode;
 
+    @ApiParam("是否黄枪")
+    private Integer isYellowGun;
+
     /**
      * 大枪查询结果构造方法
      * @param vinCode

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

@@ -85,8 +85,20 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("触发类型默认不需要外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @Transient
+    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+    @Transient
+    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    private boolean execNextModuleFlag = true;
+
+    @Transient
+    @ApiParam("默认异常未处理")
+    private boolean doErrorFlag = false;
+
 
 }

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.ptl.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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4507582337334278877L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("主任务编号")
+    private String taskNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "失败描述")
+    public String errorDesc;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "CACHE_FLAG")
+    @ApiParam(value = "缓存标识")
+    private Integer cacheFlag;
+
+    @Lob
+    @Column(name = "CONTENT")
+    @ApiParam(value = "内容")
+    private String content;
+
+}

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,9 +30,6 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("消息类型")
     private String msgType;
 
-    @ApiModelProperty("是否重试")
-    private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
-
     @ApiModelProperty("消息数据")
     private Map<String, Object> msgData;
 
@@ -52,4 +48,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("外部触发事件")
     private String triggerEvent;
 
+    @ApiModelProperty("流程类型")
+    private Integer routeType;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatusErrorRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface PtlRouteStatusErrorRecordRepository extends BaseRepository<PtlRouteStatusErrorRecord, Long> {
+}

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.bean.sweb;
+package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
@@ -27,9 +27,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_PO_TO_WMS")
+@Table(name = "SWEB_MOVEMENT_TO_WMS")
 @Api("库存移动单处理成功后的记录")
-public class WmsMovementToWms extends BaseBean {
+public class SwebMovementToWms extends BaseBean {
     private static final long serialVersionUID = -8089219927352225317L;
 
     @Column(name = "ORDER_NO")
@@ -92,4 +92,8 @@ public class WmsMovementToWms extends BaseBean {
     @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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.bean.sweb;
+package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
@@ -25,9 +25,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_PO_TO_WMS")
+@Table(name = "SWEB_PO_TO_WMS")
 @Api("库存移动单处理成功后的记录")
-public class WmsPoToWms extends BaseBean {
+public class SwebPoToWms extends BaseBean {
 
     private static final long serialVersionUID = -3999194389200855165L;
     @Column(name = "ORDER_NO")
@@ -90,4 +90,8 @@ public class WmsPoToWms extends BaseBean {
     @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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.bean.sweb;
+package cn.estsh.i3plus.pojo.sweb.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
@@ -24,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_PO_TO_WMS")
+@Table(name = "WMS_PO_TO_SWEB")
 @Api("库存移动单处理成功后的记录")
 public class WmsPoToSweb extends BaseBean {
     private static final long serialVersionUID = 4710841067412420270L;
@@ -39,4 +39,8 @@ public class WmsPoToSweb extends BaseBean {
     @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(),
+        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
-                purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
+            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/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

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

@@ -1,86 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean.sweb;
-
-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_PO_TO_WMS")
-@Api("库存移动单处理成功后的记录")
-public class WmsMovementToSweb extends BaseBean {
-    private static final long serialVersionUID = 49215041475324487L;
-
-    @Column(name = "ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    @Column(name = "ITEM")
-    @ApiParam("行号")
-    public String item;
-
-    @Column(name = "SRC_WH_NO")
-    @ApiParam("源仓库代码")
-    public String srcWhNo;
-
-    @Column(name = "DEST_ZONE_NO")
-    @ApiParam("目标存储区代码")
-    public String destZoneNo;
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name = "PART_NAME")
-    @ApiParam("物料名称")
-    private String partName;
-
-    @Column(name = "UNIT")
-    @ApiParam("单位")
-    public String unit;
-
-    /**
-     * 业务类型: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;
-
-    @Column(name = "PLAN_DATE")
-    @ApiParam(value = "计划日期")
-    private String planDate;
-
-    @Column(name = "PLAN_TIME")
-    @ApiParam(value = "计划时间")
-    private String planTime;
-
-    /**
-     * 状态:1=创建,10=待处理,20=已处理
-     */
-    @Column(name="ITEM_STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer itemStatus;
-}

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

@@ -9,7 +9,8 @@ public class WmsInterfaceEnumUtil {
         SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
         WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
-        WMS2MES(40, "WMS2MES", "WMS --> MES");
+        WMS2MES(40, "WMS2MES", "WMS --> MES"),
+        SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS");
 
         private int value;
         private String name;