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

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

@@ -271,11 +271,15 @@ public class AndonManageQueue extends BaseBean {
      * @param alarmCode
      * @param andonCount
      */
-    public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) {
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) {
         this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
         this.workCellCode = workCellCode;
         this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
         this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
         this.alarmCode = alarmCode;
         this.andonCount = andonCount;
     }
@@ -283,7 +287,9 @@ public class AndonManageQueue extends BaseBean {
     /**
      * 原因统计 使用Java内存计算（获取原始数据）
      * @param workCenterCode
+     * @param workCenterNameRdd
      * @param workCellCode
+     * @param workCellNameRdd
      * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
@@ -293,9 +299,11 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
         this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
         this.workCellCode = workCellCode;
+        this.workCellNameRdd = workCellNameRdd;
         this.alarmCode = alarmCode;
         this.ecCode = ecCode;
         this.ecNameRdd = ecNameRdd;
@@ -331,7 +339,8 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){
+    public AndonManageQueue(String workCenterNameRdd,String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){
+        this.workCenterNameRdd = workCenterNameRdd;
         this.ecNameRdd = ecNameRdd;
         this.ecCode = ecCode;
         this.alarmCode = alarmCode;

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

@@ -13,6 +13,9 @@ import lombok.Data;
 @Data
 public class MailConfig {
 
+    @ApiParam(value = "邮箱开关")
+    private int mailSwitch;
+
     @ApiParam(value = "邮箱服务器")
     private String mailHost;
 

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

@@ -50,6 +50,14 @@ public class SysDictionary extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
+    public long getParentIdVal(){
+        if(parentId == null){
+            return 0;
+        } else {
+            return parentId.longValue();
+        }
+    }
+
     @Column(name="PARENT_NAME_RDD")
     @ApiParam(value ="父级节点名称")
     private String parentNameRdd;

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

@@ -44,32 +44,14 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="角色等级（待定）" , example ="-1")
     private Integer roleGrade;
 
-    @Column(name="PARENT_ID")
-    @ApiParam(value ="角色父节点ID" , example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long parentId;
-
-    @Column(name="PARENT_NAME_RDD")
-    @ApiParam(value ="角色父节点名称" , access ="角色父节点名称")
-    private String parentNameRdd;
-
     @Column(name="MODULE_NUMBER")
     @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
     private Integer moduleNumber;
 
-    @Column(name="MODULE_NAMES_RDD")
-    @ApiParam(value ="权限模块名称" , access ="权限模块名称")
-    private String moduleNamesRdd;
-
     @Column(name="MENU_NUMBER_RDD")
     @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
     private Integer menuNumber;
 
-    @Lob
-    @Column(name="MENU_NAMES_RDD")
-    @ApiParam(value ="权限功能名称" , access ="权限功能名称")
-    private String menuNamesRdd;
-
     @Column(name="ROLE_STATUS")
     @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
     private Integer roleStatus;

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -53,4 +54,8 @@ public class SwebProcurementPlanOrderDetails extends BaseBean {
     @ApiParam(value = "行项目状态", example = "1")
     @Column(name = "ITEM_STATUS")
     private Integer itemStatus;
+
+    @Transient
+    @ApiParam(value ="采购单位")
+    private String buyUnit;
 }

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

@@ -100,4 +100,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable {
 
     @ApiParam(value = "交货时间")
     private String deliveryTime;
+
+    @ApiParam(value = "单位")
+    private String unit;
 }

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

@@ -10,10 +10,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.*;
 import java.util.List;
 
 /**
@@ -122,4 +119,8 @@ public class WmsASNMasterDetails extends BaseBean {
     @ApiParam(value = "已收数量", example = "0")
     public Double recQty;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public int lockVersion;
 }

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

@@ -194,5 +194,8 @@ public class WmsDocMovementDetails extends BaseBean {
 
     public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
-
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public int lockVersion;
 }

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

@@ -132,4 +132,9 @@ public class WmsPOMasterDetails extends BaseBean {
     public Boolean isDateCodeEdit = true;
 
     public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public int lockVersion;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -13,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Version;
 
 /**
  * @Description : 质检单明细信息
@@ -80,4 +80,9 @@ public class WmsQCDetails extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;
+
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public int lockVersion;
 }

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

@@ -1349,8 +1349,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
-        String data = String.join(",", roleIds);
-        DdlPreparedPack.getInPack(data, "roleCode", result);
+        DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
+//        String data = String.join(",", roleIds);
+        DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
         getStringBuilderPack(new WmsDataAuth(), result);
         return result;
     }
@@ -1397,7 +1398,6 @@ public class WmsHqlPack {
                 }
             }
         }
-
         // 通用数据拼接
         getStringBuilderPack(new WmsDataAuth(), result);
         return result;
@@ -1619,4 +1619,22 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 组件 历史记录查询
+     *
+     * @param wmsMoveSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHistorical(WmsMoveSn wmsMoveSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getIsDeleted(), "isDeleted", result);
+
+        return result;
+    }
 }