Merge branch 'test'

yun-zuoyi
wynne1005 5 years ago
commit 0a15e1f7a4

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -19,5 +19,37 @@
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
<id>dev</id>
<properties>
<profileActive>DEV</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profileActive>TEST</profileActive>
</properties>
</profile>
<profile>
<id>docker</id>
<properties>
<profileActive>DOCKER</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>PROD</profileActive>
</properties>
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
</build>
</project>

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

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

@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil {
CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
/* FTP */
CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器");
CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"),
SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器");
private int value;
private String description;

@ -4560,4 +4560,42 @@ public class MesEnumUtil {
return description;
}
}
/**
* BOM
* 10.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATION_BOM_MATCH_RULE {
BARCODE_RULE_MATCHING(10, "条码规则匹配"),
PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
BAR_CODE_MATCHING(30, "箱条码匹配");
private int value;
private String description;
STATION_BOM_MATCH_RULE(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;
}
}
}

@ -1963,6 +1963,31 @@ public class MesPcnEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CELL_POINT_GROUP_STATUS {
CREATE(10, "创建"),
COMPLETE(20, "完成");
private int value;
private String description;
WORK_CELL_POINT_GROUP_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* MesPartCategorycategoryType
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2448,7 +2473,7 @@ public class MesPcnEnumUtil {
IMAGE("image", "图片"),
BUTTON("button", "按钮"),
TABLES("tables", "多个表格"),
DATA("data", "表格");
FORM("form", "文本按钮");
private String value;
private String description;
@ -2928,7 +2953,7 @@ public class MesPcnEnumUtil {
BARCODE_RULE_MATCHING(10, "条码规则匹配"),
PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
BAR_CODE_MATCHING(20, "条码匹配");
BAR_CODE_MATCHING(30, "箱条码匹配");
private int value;
private String description;
@ -3138,4 +3163,75 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TABLE_COLOR {
GREEN("green", "绿色"),
YELLOW("Yellow", "黄色");
private String code;
private String description;
TABLE_COLOR(String code, String description) {
this.code = code;
this.description = description;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SHIPPING_ACTUAL_STATUS {
CREATE(10, "创建"),
CANCEL(20, "已发运");
private int value;
private String description;
SHIPPING_ACTUAL_STATUS(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;
}
}
}

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

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

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

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

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

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

@ -0,0 +1,91 @@
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;
import java.util.Date;
/**
* @Description :JIT
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2020-03-27
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "if_queue_shipping")
@Api("JIT发运数据同步")
public class IfQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = -8961182851667690154L;
@Column(name = "JIT_NO")
@ApiParam("JIT队列编号")
private String jitNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "SUPPLIER_CODE")
@ApiParam("操作人")
private String supplierCode;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private Date actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private Integer ifCode;
}

@ -42,6 +42,9 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
@ApiParam(value = "模板内容")
private String templateContent;
@ApiParam(value = "第二个模板内容")
private String otherTemplateContent;
// 参数拼接,多参数都好分隔,后台在做处理
@ApiParam(value = "模板参数拼接")
@Transient

@ -33,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308810110L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;

@ -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;
/**
@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Transient
@ApiParam("产品位置")
private String prodCfgName;
@Column(name = "PART_NAME")
@ApiParam("产品名称")
private String partName;
@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "status")
@ApiParam("状态")
private Integer status;
@Column(name = "seq")
@ApiParam("主序编号")
private String seq;
}

@ -0,0 +1,89 @@
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 javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-22 17:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT_GROUP")
@Api("工站分组队列")
public class MesWorkCellPointGroup extends BaseBean implements Serializable {
private static final long serialVersionUID = -6817903235638554748L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name = "QUEUE_SEQ")
@ApiParam("队列主表序号")
private Double queueSeq;
@Column(name = "QUEUE_DETAIL_SEQ")
@ApiParam("队列明细表序号")
private Double queueDetailSeq;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Transient
@ApiParam("显示颜色")
private String color;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0 : this.queueSeq;
}
public double getQueueDetailSeqVal() {
return this.queueDetailSeq == null ? 0 : this.queueDetailSeq;
}
}

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.ArrayList;
/**
* @Description:
@ -20,7 +21,7 @@ import java.io.Serializable;
@AllArgsConstructor
@NoArgsConstructor
@ElasticSearch
public class EsProductData extends BaseBean implements Serializable {
public class EsProductDataModule extends BaseBean implements Serializable {
private static final long serialVersionUID = 4514407617515827040L;
@ -80,7 +81,7 @@ public class EsProductData extends BaseBean implements Serializable {
@Json4Es
@ApiParam("生产数据")
private String lineData;
private ArrayList<ProductDataModel> lineData;
@ApiParam("字段总数")
private Integer fieldNum;

@ -66,6 +66,11 @@ public class QueueOrderModel implements Serializable {
private Integer groupNo;
@ApiParam("产品配置代码")
private String prodCfgCode;
@ApiParam("是否已扫描")
private int isScan;
@ApiParam("队列编号")
private String orderNo;
public QueueOrderModel() {
}
@ -124,4 +129,16 @@ public class QueueOrderModel implements Serializable {
this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode;
}
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.orderNo = orderNo;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
}
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : JITModel
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-05-22 16:34
* @Modify:
**/
@Data
@Api("JIT发运队列列表Model")
public class QueueShippingModel implements Serializable {
private Long id;
@ApiParam("显示颜色")
private String color;
@ApiParam("队列编号")
private String jisActualNo;
@ApiParam("产品位置代码")
private String produceCtgyCode;
@ApiParam("产品位置")
private String prodCfgName;
@ApiParam("起始vin")
private String vin;
@ApiParam("结束vin")
private String endVin;
@ApiParam("料架号")
private String queueGroupNo;
}

@ -97,6 +97,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("生产主队列编号")
private String orderNo;
@ApiParam("分组队列编号")
private String queueGroupNo;
@ApiParam("数据map")
private Map<String, Object> dataMap;

@ -18,12 +18,15 @@ public class StepDispatchModel {
private String cellParamKey;
private String requestBeanKey;
private String scanInfo;
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) {
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) {
this.stepListKey = stepListKey;
this.firstScanKey = firstScanKey;
this.cellParamKey = cellParamKey;
this.requestBeanKey = requestBeanKey;
this.scanInfo = scanInfo;
}
}

@ -96,5 +96,9 @@ public class StepPrintSnModel extends MesProduceSn {
private String jitCarNo;
@ApiParam("车型代码")
private String carModuleCode;
@ApiParam("上一个序列号")
private Double lastQueDetailSeq;
@ApiParam("包装数量")
private Integer pgCodeNum;
}

@ -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.IfQueueShipping;
/**
* @Description :IF_JIT
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2020-03-06 10:57
* @Modify:
**/
public interface IfQueueShippingRepository extends BaseRepository<IfQueueShipping, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPointGroup;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 14:40
* @Modify:
**/
@Repository
public interface MesWorkCellPointGroupRepository extends BaseRepository<MesWorkCellPointGroup, Long> {
}

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

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

@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean {
@ApiParam(value ="模板内容")
private String templateContent;
@Lob
@Column(name="OTHER_TEMPLATE_CONTENT")
@ApiParam(value ="其他模板内容")
private String otherTemplateContent;
// 参数拼接,多参数都好分隔,后台在做处理
@Transient
@ApiParam(value ="模板参数拼接")

@ -37,6 +37,9 @@ public class SysLocaleResource extends BaseBean {
private Integer resourceType;
@Transient
private String resourceTypes;
@Transient
private String resourceTypeTxt;
public String getResourceTypeTxt(){
@ -56,6 +59,7 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value = "语言名称",example = "浏览器语言名称")
private String languageNameRdd;
@Lob
@Column(name="resource_key")
@ApiParam(value = "资源KEY",example = "格式A.B全部大写参考命名规范开发文档")
@AnnoOutputColumn
@ -82,4 +86,5 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value = "是否系统参数",example = "2")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
private Integer isSystem;
}

@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysTask;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
import cn.estsh.i3plus.pojo.platform.bean.SysTool;
import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
import cn.estsh.i3plus.pojo.platform.bean.*;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
import java.util.stream.Collectors;
@ -42,6 +20,10 @@ import java.util.stream.Collectors;
**/
public class CoreHqlPack {
private CoreHqlPack() {
throw new IllegalStateException("Utility class");
}
/**
* In
* @param columnName
@ -81,6 +63,11 @@ public class CoreHqlPack {
if(resource != null){
DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
// 是否多类型查询
if(StringUtils.isNotBlank(resource.getResourceTypes())){
DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
}
DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
@ -630,7 +617,7 @@ public class CoreHqlPack {
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){
HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
}
@ -653,7 +640,7 @@ public class CoreHqlPack {
DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
DdlPreparedPack.getInPackList(idList,"id",result);
if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){
DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
}
@ -677,7 +664,7 @@ public class CoreHqlPack {
// And
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
if(idList != null && idList.size() > 0){
if(idList != null && !idList.isEmpty()){
HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
}
@ -977,7 +964,7 @@ public class CoreHqlPack {
*/
public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean);
return packBean;
}

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

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

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

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

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

@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean {
@ApiParam(value = "是否预分配人员")
private Integer isPreAssign;
@Column(name="SHIFT_NO")
@ApiParam("班次编码")
private String shiftNo;
@Transient
@ApiParam(value = "供应商名称")
private String vendorName;
@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean {
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Transient
@ApiParam(value = "分配次数")
private Integer count;
}

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

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
@ -222,36 +222,4 @@
<!--</plugins>-->
<!--</build>-->
<profiles>
<profile>
<id>dev</id>
<properties>
<profileActive>DEV</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profileActive>TEST</profileActive>
</properties>
</profile>
<profile>
<id>docker</id>
<properties>
<profileActive>DOCKER</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>PROD</profileActive>
</properties>
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${profileActive}-${project.version}</finalName>
</build>
</project>
Loading…
Cancel
Save