Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -1211,7 +1211,7 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
         PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
         PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
+        CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
         FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;

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

@@ -1966,7 +1966,8 @@ public class MesEnumUtil {
         SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
         MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
         MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"),
-        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入");
+        BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
+        BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入");
 
         private int value;
         private String service;
@@ -5165,7 +5166,8 @@ public class MesEnumUtil {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
-        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
+        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
+        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板");
 
         private String code;
         private String description;
@@ -5563,14 +5565,15 @@ public class MesEnumUtil {
 
 
     /**
-     * 运算对象代码
+     * 运算对象代码 Period capacity
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
         ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
         ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
         WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
-        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"),
+        PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能");
 
         private String value;
         private String description;
@@ -6786,4 +6789,96 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_TYPE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 工位等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CELL_GRADE {
+
+        COMMON(10, "普通工位"),
+        MONITOR(20, "监控工位");
+
+        private int value;
+        private String description;
+
+        WORK_CELL_GRADE(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2592,7 +2592,8 @@ public class MesPcnEnumUtil {
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
         IMAGE_LIST("image_list", "图片列表"),
-        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"),
+        BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字");
 
         private String value;
         private String description;
@@ -4023,7 +4024,8 @@ public class MesPcnEnumUtil {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
         JUMP_STATE(30, "跳过状态点"),
-        ABNORMAL_DEDUCTION(40, "扣减异常");
+        ABNORMAL_DEDUCTION(40, "扣减异常"),
+        REDO_STATION(50, "工位重做");
 
         private int value;
         private String description;
@@ -4564,4 +4566,23 @@ public class MesPcnEnumUtil {
 
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PTL_IS_LIGHT {
+
+        IS_PICK_LIGHT(10, "不需亮灯");
+
+        private int value;
+        private String description;
+
+        MES_PTL_IS_LIGHT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
 }

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

@@ -300,6 +300,62 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 单据主表状态(ASN,PO,MOVE,QC,SO)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_MASTER_ORDER_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "已生成"),
+        FAILED(30, "RECEIPT_FINISH", "生成失败");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PICKING_MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 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);
+        }
+    }
     /**
      * 收货状态
      */
@@ -799,7 +855,8 @@ public class WmsEnumUtil {
         PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"),
         INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"),
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
-        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废");
+        MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
+        PROD_SCRAP(680, "PROD_SCRAP", "生产报废");
         private int value;
         private String code;
         private String description;
@@ -8794,4 +8851,80 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * BOM
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_PRODUCTING_LINE {
+        GJ(10, "PIPE", "管件"),
+        JF(20, "JF", "夹方"),
+        JH(30, "JH", "机焊"),
+        SH(40, "SH", "手焊");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        BOM_PRODUCTING_LINE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = 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) {
+            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 BOM_PRODUCTING_LINE 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/MesBoardPlanCapacity.java

@@ -56,6 +56,30 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
     @ApiParam("计划产量")
     private Integer planCapacity;
 
+    @Column(name = "MONTH_PLAN_CAPACITY")
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @Column(name = "HOUR_CAPACITY")
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @Column(name = "STOP_TIME")
+    @ApiParam("停机时间")
+    private Double stopTime;
+
+    @Column(name = "ACTUAL_CAPACITY")
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "IS_MANUAL")
+    @ApiParam("是否手工展示")
+    private Integer isManual;
+
     @Transient
     @ApiParam("班次名称")
     private String shiftName;

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

@@ -39,14 +39,22 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "CUSTOMER_PART_NO")
-    @ApiParam("客户零件号")
+    @ApiParam("客户物料号")
     private String customerPartNo;
 
     @Column(name = "CUSTOMER_PART_NAME")
-    @ApiParam("客户零件描述")
+    @ApiParam("客户物料名称")
     private String customerPartName;
 
+    @Column(name = "CUSTOMER_PART_COLOR")
+    @ApiParam("客户物料颜色")
+    private String customerPartColor;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty;
+
     @Column(name = "CUSTOMER_CFG_CODE")
-    @ApiParam("客戶配置代碼")
+    @ApiParam("客户配置代码")
     private String customerCfgCode;
 }

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

@@ -108,6 +108,14 @@ public class MesOee extends BaseBean implements Serializable {
     @ApiParam("OEE")
     private Double oee;
 
+    @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE目标值")
+    private Double targetOee;
+
+    @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE警戒值")
+    private Double minOee;
+
     @Column(name = "BUSI_DATA")
     @ApiParam("自定义数据")
     private String busiData;

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

@@ -47,4 +47,12 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @Column(name = "PART_SN")
     @ApiParam("料箱条码")
     private String partSn;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Double targetPassRate;
+
+    @Column(name = "PRIORITY_ORDER")
+    @ApiParam("优先级顺序")
+    private Integer priorityOder;
 }

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

@@ -185,6 +185,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码打印状态名称")
     private String printStatusName;
 
+    @Transient
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Transient
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Transient
+    @ApiParam("电检结果")
+    private String electricResult;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -66,6 +66,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工作单元端口")
     private String workCellPort;
 
+    @Column(name = "GRADE")
+    @ApiParam("工作等级")
+    private Integer grade;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Double targetPassRate;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -71,6 +71,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("工位监控模式")
     private Integer monitorType;
 
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("节拍")
+    private Integer planTakt;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java

@@ -22,7 +22,10 @@ import javax.persistence.*;
 @DynamicUpdate
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", indexes = {
+        @Index(columnList = "SCRIPT_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;

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

@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/28 2:37 下午
+ * @Modify:
+ */
+@Data
+public class BiModel {
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "计划数量")
+    private double planQty;
+
+    @ApiParam(value = "合格数量")
+    private double passQty = 0;
+
+    @ApiParam(value = "不良数量")
+    private double ngQty = 0;
+
+    @ApiParam(value = "实际数量")
+    private double actualQty = 0;
+
+    @ApiParam(value = "合格率")
+    private double passRate;
+
+    @ApiParam(value = "不良率")
+    private double ngRate;
+
+    @ApiParam(value = "警戒值")
+    private double sentinelValue;
+
+    @ApiParam(value = "总数")
+    private double total;
+
+    @ApiParam(value = "合格数")
+    private double qualifiedQty = 0;
+
+    @ApiParam(value = "不合格数")
+    private double unQualifiedQty = 0;
+
+    @ApiParam("目标合格率")
+    private double targetPassRate;
+
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("一些携带值 eg:异常类型，异常次数")
+    private Map<String, Object> carryMap;
+
+    @ApiParam("图表显示的数据")
+    private List<ProductBiSeriesModel> series;
+
+    @ApiParam("列名")
+    private Map<String, String> colMap;
+}

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

@@ -41,6 +41,28 @@ public class BoardModel {
     @ApiParam("当天停机时间(min)")
     private String theDayShutDownTime;
 
+
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @ApiParam("停机时间")
+    private double stopTime;
+
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @ApiParam("计划节拍")
+    private Integer planTakt = 0;
+
+    @ApiParam("今日完成产量")
+    private Integer completeCapacity = 0;
+
+    @ApiParam("时段产能")
+    private Integer periodCapacity = 0;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
 

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

@@ -25,4 +25,10 @@ public class DataReviewModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("是否合格标识")
+    private Integer reviewFlag;
+
+    @ApiParam("是否合格")
+    private String reviewResult;
+
 }

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

@@ -3,8 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Transient;
+import java.util.List;
-
 /**
  * @Description:
  * @Author: jokelin
@@ -25,10 +24,15 @@ public class OperateObjectParamModel {
     @ApiParam("日期")
     private String oeeDate;
 
+    @ApiParam("开始日期")
+    private String startDatetime;
+
+    @ApiParam("结束日期")
+    private String endDatetime;
+
     @ApiParam("开始时段")
     private String startTime;
 
-    @Transient
     @ApiParam("结束时段")
     private String endTime;
 

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.mes;
 
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -143,6 +144,10 @@ public class TorqueCollectionModel implements Serializable {
 
     private Map<String, PsetModel> psets = new LinkedHashMap<>();
 
+    public TorqueCollectionModel(String vinCode) {
+        this.vinCode = vinCode;
+    }
+
     /**
      * 大枪查询结果构造方法
      *

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

@@ -36,4 +36,6 @@ public abstract class BaseComponetsParam implements Serializable {
 
     @ApiParam(value = "工厂代码")
     public String organizeCode;
+
+
 }

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

@@ -52,4 +52,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam(value = "新条码")
     public WmsStockSn NewWmsStockSn;
+
+    @ApiParam(value = "拆分条码")
+    public Integer splitSn;
 }

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

@@ -119,6 +119,12 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "工厂代码")
     private String organizeCode;
 
+    @ApiParam(value = "提交模式")
+    private Integer commitMode;
+
+    @ApiParam(value = "是否允许重置")
+    private Integer isResetAble;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板参数拼接")
     private String paramsPack;
 
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
     @Transient
     @ApiParam(value ="模板id对应的模板参数")
     private List<SysLabelTemplateParam> labelTemplateParamList;

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

@@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isAutoCommit;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false)
+    @ApiParam(value = "是否允许重置")
+    @AnnoOutputColumn
+    private Integer isResetAble;
+
     @Lob
     @Column(name = "POSITION", columnDefinition = "TEXT")
     @ApiParam(value = "GOJS位置")
@@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }
 
-    public int geSubmitStepSeqVal() {
+    public int getSubmitStepSeqVal() {
         return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue();
     }
+
+    public int getIsResetAbleVal() {
+        return this.isResetAble == null ? 0 : this.isResetAble.intValue();
+    }
 }

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

@@ -225,4 +225,9 @@ public class WmsCSOrderDetails extends BaseBean {
         this.factQty=factQty;
         this.locateNo=locateNo;
     }
+
+    public WmsCSOrderDetails(String partNo,String partNameRdd) {
+        this.partNo=partNo;
+        this.partNameRdd = partNameRdd;
+    }
 }

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

@@ -179,6 +179,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+
+    @Column(name = "DEST_XB_ZONE_NO")
+    @ApiParam("目的线边存储区代码")
+    public String destXBZoneNo;
+
     @Column(name = "LOT_NO")
     @ApiParam("批次")
     public String lotNo;
@@ -231,6 +236,7 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "父位置号")
     private String seqNo;
 
+
     @Transient
     @ApiParam(value = "客户编号")
     private String custNo;
@@ -384,6 +390,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String refSrc;
 
+    @Transient
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+
 
     public WmsDocMovementDetails () {
 

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

@@ -46,7 +46,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "ORDER_NO")
     @ApiParam(value = "移库单单号")
     private String orderNo;
-    /**
+    /**e
      * 移动类型:IN=入库,OUT=出库,MOVE=移库
      */
     @Column(name = "MOVE_TYPE")
@@ -231,6 +231,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "备注1")
     private String remake;
 
+
+    /**
+     * 10=未生成，20=生成成功，30=生成失败
+     */
+    @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10")
+    @ApiParam(value = "领料单生成状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickingOrderStatus;
+
     @Column(name = "SECONDARY_REMAKE")
     @ApiParam(value = "备注2")
     private String secondaryRemake;

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

@@ -1,3 +1,4 @@
+
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;

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

@@ -142,8 +142,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_GROUP")
     @ApiParam(value = "物料组")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
-            isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
+            isMultiple = 1, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String partGroup;
 
     @Column(name = "LOT_CHECK_RULE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :单据
+ * @Reference :
+ * @Author :puxiao.liao
+ * @CreateDate : 2020-07-21 2:37 下午
+ * @Modify:
+ **/
+@Data
+@Api("单据")
+public class WmsDocMovementMasterDto implements Serializable {
+
+    private static final long serialVersionUID = -1388177116144308137L;
+
+    @ApiParam("工厂编号")
+    private String organizeCode;
+
+    @ApiParam("单据明细")
+    private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
+
+}