master merge test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -29,10 +30,12 @@ public class HeuristicRule extends BaseRule {
     @ApiParam(value ="工作筛选")
     private String workFilter;
 
+    @Lob
     @Column(name="WORK_SORT")
     @ApiParam(value ="工作排序")
     private String workSort;
 
+    @Lob
     @Column(name="RES_SELECT")
     @ApiParam(value ="资源选择")
     private String resSelect;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java

@@ -95,7 +95,7 @@ public class ProductOrder extends BaseOrder {
 
     @Column(name="AUTO_SUPPLY")
     @ApiParam(value ="物料计算时自动补充")
-    @FieldAnnotation(defaultValue = "true")
+    @FieldAnnotation(defaultValue = "false", display = false)
     private Boolean autoSupply;
 
     @Column(name="PRODUCT_ROUTING_ID")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -137,10 +137,10 @@ public class Pager {
 
     public int getStartRow() {
         if(pageSize > 0){
-            if(currentPage >= 1){
-                return currentPage * pageSize - pageSize;
-            }else {
-                return 0;
+            if (currentPage >= 1) {
+                startRow = currentPage * pageSize - pageSize;
+            } else {
+                startRow = 0;
             }
         }
         return startRow;

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

@@ -664,7 +664,6 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_SORT_RULE {
-        NONE("NONE", "非内置"),
         ORDER_LET("ORDER_LET", "订单交货期"),
         ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
         ORDER_EST("ORDER_EST", "订单最早开始时刻"),
@@ -682,7 +681,8 @@ public class ApsEnumUtil {
         WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
         TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
         TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单代码"),
-        TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级");
+        TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"),
+        CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
 
         private String value;
         private String description;

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

@@ -1251,7 +1251,7 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_STORAGE {
-        MONGO(1, "MongoDB"),
+//        MONGO(1, "MongoDB"),
         ELASTICSEARCH(2, "Elasticsearch");
         private int value;
         private String description;

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

@@ -1970,7 +1970,10 @@ public class MesEnumUtil {
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
         BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
         MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
-        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
+        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"),
+        MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
+        MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"),
+        MES_LOCATION(570, "locationExcelService", "库位信息导入");
 
         private int value;
         private String service;

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

@@ -2591,7 +2591,10 @@ public class MesPcnEnumUtil {
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
         PROCESS_CONTENT("processContent", "过程组件内容"),
         TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
+        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
         TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
+        ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
 
         private String value;
@@ -3555,7 +3558,7 @@ public class MesPcnEnumUtil {
         REDO_PROCESS(20, "REDO_PROCESS", "重做工序"),
         JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
         NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"),
-        CLEAR_CACHE(50, "CLEAR_CACHE", "工步已经清空缓存 无需执行完之后放入RequestBean");
+        CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存，执行完工步之后无需放入StationRequestBean");
 
         private int value;
         private String code;
@@ -4850,4 +4853,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 排程记录 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SCHEDULING_RECORD_STATUS {
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private Integer value;
+        private String description;
+
+        SCHEDULING_RECORD_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -857,7 +857,10 @@ public class WmsEnumUtil {
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
         MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
         PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
-        OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料");
+        OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
+        OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"),
+        WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
+        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库");
 
         private int value;
         private String code;

modules/i3plus-pojo-jobflow/pom.xml

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

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

@@ -143,4 +143,8 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @Column(name = "JIS_BACKFLUSH_STATUS")
     @ApiParam("回冲状态")
     private String jisBackflushStatus;
+
+    @Column(name = "CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
 }

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

@@ -47,6 +47,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     @ApiParam("缓存类型")
     private Integer cfgType;
 
+    @Column(name = "SEQ")
+    @ApiParam("排序号")
+    private Integer seq;
+
     @Transient
     @ApiParam("当前JIT缓存数")
     private Integer currentJitCacheNum;

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

@@ -49,4 +49,8 @@ public class MesJitLockCache extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 }

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

@@ -52,4 +52,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
 }

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

@@ -46,6 +46,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam("方法代码")
     private String methodCode;
 
+    @Column(name = "BATCH_METHOD_CODE")
+    @ApiParam("批量方法代码")
+    private String batchMethodCode;
+
     @ApiParam(value = "第二个模板内容")
     private String otherTemplateContent;
 

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

@@ -55,7 +55,15 @@ public class MesLocation extends BaseBean implements Serializable {
     @ApiParam("最大存储量")
     private Integer maxQty = 0;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("物料名称")
     private String partNameRdd;
+
+    @Transient
+    @ApiParam("包装编号集合")
+    private String packageNoList;
 }

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

@@ -98,6 +98,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户代码")
     private String custCode;
 
+    @Column(name = "IN_LOCATION_TIME")
+    @ApiParam("入库时间")
+    private String inLocationTime;
+
     @Transient
     @ApiParam("封箱状态")
     private String sealStatus;
@@ -140,6 +144,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("目标库位代码")
     private String destLocationCode;
 
+    @Transient
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
     public MesPackage() {
     }
 
@@ -150,4 +158,13 @@ public class MesPackage extends BaseBean implements Serializable {
         this.qty = qty;
         this.packSpecQty = packSpecQty;
     }
+
+    public MesPackage(String partNo, String partNameRdd,String packageNo, Double qty, String defectActionType, String createDatetime) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.defectActionType = defectActionType;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -120,6 +120,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("打磨件物料号")
     private String prePartNo;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -65,4 +66,12 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")
     private String prodCfgCode;
+
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
 }

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

@@ -0,0 +1,43 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/8/29 5:11 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SCHEDULING_RECORD")
+@Api("MES_排程记录表")
+public class MesSchedulingRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 5841185737664839362L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

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

@@ -82,6 +82,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
     @ApiParam("状态点顺序")
     private Integer seq;
 
+    @Column(name = "IS_INIT")
+    @ApiParam("是否初始化")
+    private Integer isInit = 1;
+
     @Transient
     @ApiParam("状态点是否完成")
     private boolean isComplete;

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

@@ -49,4 +49,8 @@ public class MesTypeCfg extends BaseBean implements Serializable {
     @Column(name = "COLOR_VALUE")
     @ApiParam("颜色值")
     private String colorValue;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
 }

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

@@ -20,6 +20,9 @@ public class InjectionFeedingModel {
     @ApiParam("原材料物料号")
     private String partNo;
 
+    @ApiParam("原材料物料名称")
+    private String partName;
+
     @ApiParam("是否锁定：1=是，2=否")
     private Integer lockFlag;
 

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

@@ -106,13 +106,14 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory,
+                             String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.status = status;
         this.workCenterCode = workCenterCode;
-        this.equipmentCategory = equipmentCategory;
+        this.modifyDatetime = modifyDatetime;
     }
 
     //根据生产线，工位获取设备集合 findMesEquipmentList

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,6 +20,9 @@ public class MesPaintSnPrintModel implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @ApiParam("过程条码数组")
+    private List<String> serialNumberList;
+
     @ApiParam("产品条码")
     private String produceSn;
 

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

@@ -104,12 +104,14 @@ public class ProductInfoManageModel {
         this.queDetailSeq = queDetailSeq;
     }
 
-    public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) {
+    public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq,
+                                  Double queueSeq, String workType, String produceColor) {
         this.vinCode = vinCode;
         this.produceCategoryCode = produceCategoryCode;
         this.orderNo = orderNo;
         this.queDetailSeq = queDetailSeq;
         this.queueSeq = queueSeq;
         this.workType = workType;
+        this.produceColor = produceColor;
     }
 }

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/8/29 10:04 下午
+ * @Modify:
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TorqueGatherModel {
+
+    @ApiParam("枪号")
+    private String torqueNo;
+
+    @ApiParam("扭矩值")
+    private String torqueValue;
+
+    @ApiParam("扭矩角")
+    private String torqueAngle;
+
+    @ApiParam("是否合格")
+    private String isQualified;
+}

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author adair.song
+ * @date 2020/6/16 14:21
+ * @desc 枪头更换计数弹框model
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("枪头更换计数弹框model")
+public class TorqueHeadChangeModel {
+
+    @ApiParam(name = "确认密码")
+    private String passWord;
+
+    @ApiParam(name = "工厂")
+    private String organizeCode;
+
+    @ApiParam(name = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(name = "工作单元")
+    private String workCellCode;
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSchedulingRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/8/29 5:15 下午
+ * @Modify:
+ */
+@Repository
+public interface MesSchedulingRecordRepository extends BaseRepository<MesSchedulingRecord, Long> {
+}

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

@@ -3267,4 +3267,13 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesLocation(MesLocation mesLocation) {
+        DdlPackBean packBean = getAllBaseData(mesLocation.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesLocation.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationCode(), "locationCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationName(), "locationName", packBean);
+        DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String receiveDateTime;
 
+    @Transient
+    @ApiParam("类型名称")
+    public String busiTypeName;
+
+    @Transient
+    @ApiParam("物料编号")
+    public String partNo;
+
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
+    @Transient
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Transient
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Transient
+    @ApiParam(value = "电话号码")
+    private String custTel;
+
+    @Transient
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Transient
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value="修改日期查询用，查询起始日期")
+    public String modifyDateTimeStart;
+
+    @Transient
+    @ApiParam(value = "修改日期查询用，查询结束日期")
+    public String modifyDateTimeEnd;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -108,6 +108,15 @@ public class BsSuitCase extends BaseBean {
         return isNeedCertification.intValue();
     }
 
+    @Column(name = "IS_SAVE_EMPTY_MSG")
+    @ApiParam(value = "是否保存空报文")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isSaveEmptyMsg;
+
+    public int getIsSaveEmptyMsgVal(){
+        return isSaveEmptyMsg == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSaveEmptyMsg;
+    }
+
     @Column(name = "IS_PUSH_MQ")
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 适配记录
@@ -137,6 +138,8 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "脚本结果")
     private String scriptResult;
 
+    /************************************** 临时属性 ***************************************/
+
     @Transient
     @ApiParam(value = "适配记录参数")
     private List<BsSuitRecordParam> bsSuitRecordParamList;
@@ -154,6 +157,10 @@ public class BsSuitRecord extends BaseBean {
     private List<BsSuitFile> bsSuitFileList;
 
     @Transient
+    @ApiParam(value = "日志长文本记录集合<关联类型，记录内容>")
+    private Map<Integer ,BsLongData> bsLongDataMap;
+
+    @Transient
     @ApiParam(value = "适配记录报文-查询条件")
     private String searchMessage;
 

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
 
 /**
  * @Description :作业记录参数表
@@ -40,7 +42,10 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Transient
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "业务单号")
+    public String orderNo;
+
     @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;

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

@@ -28,8 +28,11 @@ import javax.persistence.Table;
 @Table(name = "WMS_ACTION_MODULE")
 @Api("作业步骤处理组件")
 public class WmsActionModule extends BaseBean {
-
     private static final long serialVersionUID = 9117362998863937579L;
+
+    private static final int TRUE = 1;
+    private static final int FALSE = 2;
+
     @Column(name = "AM_NAME",nullable = false)
     @ApiParam("组件名称")
     @AnnoOutputColumn
@@ -63,6 +66,22 @@ public class WmsActionModule extends BaseBean {
     @ApiParam(value = "作业类型名称")
     public String opTypeName;
 
+    @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2")
+    @ApiParam(value = "是否脚本组件")
+    private Integer isScriptModule = FALSE;
+
+    /**
+     * 是否脚本组件
+     * @return
+     */
+    public boolean isScriptModule() {
+        if (this.isScriptModule != null && this.isScriptModule.intValue() == TRUE) {
+            return true;
+        }
+
+        return false;
+    }
+
     public WmsActionModule() {
     }
 

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

@@ -11,11 +11,7 @@ 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.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -117,6 +113,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public String vendorNo;
 
     @Column(name = "LOT_NO", nullable = false)
+    @ColumnDefault("")
     @ApiParam("收货批次")
     public String lotNo = "";
 

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

@@ -248,6 +248,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "替代物料编码")
     private String subPartNo;
 
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
 
     @Transient
     @ApiParam(value = "替代物料名称")
@@ -474,4 +477,31 @@ public class WmsDocMovementDetails extends BaseBean {
         this.createDatetime = createDatetime;
     }
 
+    public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) {
+        this.id = wmsDocMovementDetails.getId();
+        this.orderNo = wmsDocMovementDetails.getOrderNo();
+        this.partNo = wmsDocMovementDetails.getPartNo();
+        this.qty = wmsDocMovementDetails.getQty();
+        this.seqNo = wmsDocMovementDetails.getSeqNo();
+        this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
+        this.partSpec = wmsDocMovementDetails.getPartSpec();
+        this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode();
+        this.productionGroup = wmsDocMovementDetails.getProductionGroup();
+        this.item = wmsDocMovementDetails.getItem();
+        this.planTime = wmsDocMovementDetails.getPlanTime();
+        this.planDate = wmsDocMovementDetails.getPlanDate();
+        this.unit = wmsDocMovementDetails.getUnit();
+        this.custNo = wmsDocMovementDetails.getCustNo();
+        this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
+        this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
+        this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
+        this.destWhNo = wmsDocMovementDetails.getDestWhNo();
+        this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
+        this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
+        this.color = color;
+    }
 }

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

@@ -277,6 +277,14 @@ public class WmsDocMovementMaster extends BaseBean {
     public String title;
 
     @Transient
+    @ApiParam(value = "生产小组")
+    private String productionGroup;
+
+    @Transient
+    @ApiParam(value = "父位置号")
+    private String seqNo;
+
+    @Transient
     @ApiParam("物料编号组")
     public String[] partNos;
 
@@ -284,6 +292,42 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("工厂集合")
     private List<String> organizeCodeList;
 
+    @Transient
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Transient
+    @ApiParam(value = "简称")
+    private String partSpec;
+
+    @Transient
+    @ApiParam(value = "工单码")
+    private String workOrderCode;
+
+    @Transient
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Transient
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Transient
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Transient
+    @ApiParam(value = "电话号码")
+    private String custTel;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
@@ -299,4 +343,32 @@ public class WmsDocMovementMaster extends BaseBean {
 
     public WmsDocMovementMaster() {
     }
+    public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd,
+                                String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime,
+                                String custName,String custDesc,String custAddr,String custOwner,String custTel) {
+
+        this.id = wmsDocMovementMaster.getId();
+        this.orderNo = wmsDocMovementMaster.getOrderNo();
+        this.custNo = wmsDocMovementMaster.getCustNo();
+        this.organizeCode = wmsDocMovementMaster.getOrganizeCode();
+        this.orderStatus = wmsDocMovementMaster.getOrderStatus();
+        this.vendorNo = wmsDocMovementMaster.getVendorNo();
+        this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo();
+        this.seqNo = seqNo;
+        this.assignSrcZoneNo = assignSrcZoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.partSpec = partSpec;
+        this.workOrderCode = workOrderCode;
+        this.qty = qty;
+        this.productionGroup = productionGroup;
+        this.busiType = busiType;
+        this.modifyDatetime = modifyDatetime;
+//        this.color = color;
+        this.custName = custName;
+        this.custDesc = custDesc;
+        this.custAddr = custAddr;
+        this.custOwner = custOwner;
+        this.custTel = custTel;
+    }
 }

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

@@ -173,6 +173,10 @@ public class WmsDocMovementSn extends BaseBean {
     private String whNo;
 
     @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
@@ -254,7 +258,20 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String vendorNo,Integer snStatus,Double sumQty) {
+                            String version,String whNo,Integer snStatus,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.version = version;
+        this.whNo = whNo;
+        this.snStatus = snStatus;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -262,6 +279,7 @@ public class WmsDocMovementSn extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.version = version;
         this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }

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

@@ -242,6 +242,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     public Integer lockVersion;
 
     @Transient
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Transient
     @ApiParam(value = "快照时间")
     private String snapshotTime;
 

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

@@ -180,6 +180,10 @@ public class WmsMoveSn extends BaseBean {
     public String serialSn;
 
     @Transient
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     private Integer busiTypeCode;
@@ -376,4 +380,25 @@ public class WmsMoveSn extends BaseBean {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo,
+                     Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus,
+                     Integer srcSnStatus,Integer destSnStatus ) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.vendorNo = vendorNo;
+        this.custNo = custNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcQty = srcQty;
+        this.destQty = destQty;
+        this.orderNo = orderNo;
+        this.srcWhNo = srcWhNo;
+        this.srcQcStatus = srcQcStatus;
+        this.descQcStatus = descQcStatus;
+        this.srcSnStatus = srcSnStatus;
+        this.destSnStatus = destSnStatus;;
+    }
 }

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

@@ -92,6 +92,18 @@ public class WmsTaskInfo extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("是否同步")
+    public Integer syncStatus = 10;
+
+    @Column(name = "SYNC_DATE_TIME")
+    @ApiParam(value = "同步时间", example = "1")
+    public String syncDateTime;
+
+    @Column(name = "SYNC_USER")
+    @ApiParam(value = "同步人", example = "1")
+    public String syncUser;
+
     @Transient
     @ApiParam("计划日期")
     private String zdate;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.engine.rule;
 
-import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -54,5 +53,10 @@ public class GenerateLocateRule {
      */
     private boolean orderByAxle;
 
+    /**
+     * 是否空库位
+     */
+    private boolean isEmptyLocate;
+
 
 }

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

@@ -3481,4 +3481,23 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 字典查询
+     *
+     * @param wmsEnum
+     * @return
+     */
+    public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result);
+        DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result);
+
+        getStringBuilderPack(wmsEnum, result);
+
+        return result;
+    }
 }

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./