diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 385b069..cc45276 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "IP地址") private String nodeIP; + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "OPC_URL") + @ApiParam("OPCUA路径") + private String opcUrl; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + @Column(name = "CHANNEL_NAME") @ApiParam(value = "通道名称") private String channelName; @@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "标签类型") private String tagType; + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 47588b4..b6ac672 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable { private String msgType; @ApiModelProperty("消息数据") - private Map msgData; + private Map msgData = new HashMap<>(); @ApiModelProperty("流程状态集合") private List routeStatusList; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3dc606c..69d0cb2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3325,7 +3325,8 @@ public class MesEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -7219,6 +7220,111 @@ public class MesEnumUtil { } /** + * 触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_TRIGGER_TYPE { + INTERNAL_TRIGGER(10, "内部触发"), + EXTERNAL_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + STEP_TRIGGER_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; + } + } + + /** + * 客户JIT队列明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS { + NORMAL(10, "正常"), + WASHED_MATERIAL(20, "已冲料"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_DETAIL_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; + } + } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + 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].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 质检单审批处理意见 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 40c069d..b1bb580 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1886,7 +1886,8 @@ public class MesPcnEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -5214,6 +5215,41 @@ public class MesPcnEnumUtil { } /** + * 是否展示放空队列 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_VENTING_QUEUE { + CREATE(10, "显示"), + SHIPMENT(20, "不显示"); + + private int value; + private String description; + + SHOW_VENTING_QUEUE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 过程检测数据源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 926f68f..341490d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -649,6 +650,33 @@ public class DdlPreparedPack { } } + + /** + * 多个字段列or查询 + * + * @param data + * @param columnNames + * @param columnNamesKey + * @param packBean + */ + public static void getMultOrPackString(String data, List columnNames, String columnNamesKey, DdlPackBean packBean) { + StringBuffer sbf = new StringBuffer(" and ( "); + if (StringUtil.isEmpty(columnNamesKey)) { + columnNamesKey = "mult_column_name"; + } + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + sbf.append(" model." + columnName + "=:m_" + columnNamesKey); + if (i == columnNames.size() - 1) { + continue; + } + sbf.append(" or "); + } + sbf.append(" )"); + packBean.addColumnQuery(columnNamesKey, sbf.toString(), data); + + } + /** * 封装in String查询语句 * diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index dcf9033..70fab83 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -88,6 +85,14 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("BOM代码") private String bomCode; + @Transient + @ApiParam(value = "过程条码") + public String serialNumber; + + @Transient + @ApiParam(value = "已拆解数量") + public Double scrapQty = 0d; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 6224656..7b4df40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -45,4 +45,16 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "CUST_PROD_LINE_FLAG") + @ApiParam("客户产线标识") + private String custProdLineFlag; + + @Column(name = "DOCK_NO") + @ApiParam("dock") + private String dockNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index a22dd03..c809906 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("库位代码") private String locationCode; + @Column(name = "ERP_WORK_CENTER_CODE") + @ApiParam("erp工作中心") + private String erpWorkCenterCode; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 742a516..ca86eb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -96,6 +96,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus = "BACKFLUSH"; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + @Transient @ApiParam("工单类型") private Integer woType; @@ -108,6 +124,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("数量") private long qty; + @Transient + @ApiParam("是否拆解件") + private Integer isDisPart; + public MesQueueJitActualDetail() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index bd996b0..5d1f42f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -136,6 +136,28 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品颜色") private String colorName; + @Transient + @ApiParam("零件号") + private String partNo; + + @Transient + @ApiParam("零件名称") + private String partNameRdd; + + @Transient + @ApiParam("箱数") + private Integer boxQty; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + public MesQueueOrder(){} + public int getStatusVal() { return this.status == null ? 0 : this.status; } @@ -144,4 +166,21 @@ public class MesQueueOrder extends BaseBean implements Serializable { return this.seq == null ? 0.0d : this.seq; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workType = workType; + this.orderNo = orderNo; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 382dd6a..505fd9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -124,6 +124,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + @Transient @ApiParam("Vin") private String vinCode; @@ -181,10 +193,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private Integer masterStatus; @Transient - @ApiParam("产品条码") - private String productSn; - - @Transient @ApiParam("队列类型") private Integer queueType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java new file mode 100644 index 0000000..931906d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class DismantleRecordModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("物料拆解集合") + private List dismantleRecordList; + + @ApiParam("不良集合") + private List defectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 917b27c..1fdcdda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: 条码解绑实体 * @Reference: @@ -12,7 +14,7 @@ import lombok.Data; * @Modify: **/ @Data -public class FutrueTaskModel { +public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; @@ -23,5 +25,21 @@ public class FutrueTaskModel { @ApiParam("过程条码") private MesProduceSn produceSn; + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("总装批量执行逻辑") + private List requestBeanList; + + @ApiParam("总装批量执行逻辑") + private Object specialBusinessType; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java new file mode 100644 index 0000000..4cee1fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +@Api("JIT队列列表Model") +public class QueueJitActualModel { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("JIT排序号") + private String jitSeq; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("工单类型") + public Integer workType; + + @ApiParam("工单类型") + public String workTypeName; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("明细状态名称") + private Integer detailStatus; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("用量") + private Double qty = 0d; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料号") + private String partName; + + + public QueueJitActualModel() { + + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + String productSn, Integer detailStatus, String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.workType = workType; + this.custProdLineCode = custProdLineCode; + this.produceCtgyCode = produceCtgyCode; + this.productSn = productSn; + this.detailStatus = detailStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty, + String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java deleted file mode 100644 index 4cfc59e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/3/20 9:02 下午 - * @Modify: - */ -@Data -public class QueueJitActualModule { - - private Long id; - @ApiParam("vin") - private String vinCode; - @ApiParam("排序号") - private Double seq; - @ApiParam("分组队列编号") - private String queueGroupNo; - @ApiParam("组内编号") - private Integer groupNo; - @ApiParam("JIT排序号") - private String jitSeq; - - public QueueJitActualModule() { - - } - - public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) { - this.id = id; - this.vinCode = vinCode; - this.seq = seq; - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.jitSeq = jitSeq; - } - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 8dc57e7..b16d1f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -106,6 +106,14 @@ public class QueueOrderModel implements Serializable { private String jitSeq; private Integer status; + @ApiParam("回冲标识") + private String jisBackflushStatus; + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("是否放空") + private Integer isEmpty; + public QueueOrderModel() { } @@ -350,4 +358,13 @@ public class QueueOrderModel implements Serializable { this.jitSeq = jitSeq; this.status = status; } + + // getQueueJitActualDetailByNo + public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) { + this.id = id; + this.jisActualNo = jisActualNo; + this.serialNumber = serialNumber; + this.vinCode = vinCode; + this.jisBackflushStatus = jisBackflushStatus; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index c3d4274..527391a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -119,13 +119,10 @@ public class UserExportModel extends BaseBean { @ApiModelProperty(value ="家庭地址") private String infoFamilyAddress; - @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @ApiModelProperty(value ="账号状态" , example ="-1") @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; - @ApiModelProperty(value ="用户状态" , example ="-1") - private Integer infoStatus; - public UserExportModel() { } @@ -135,38 +132,52 @@ public class UserExportModel extends BaseBean { } public UserExportModel setSysUser(SysUser sysUser){ - this.userLoginName=sysUser.getUserLoginName(); - this.userPhone=sysUser.getUserPhone(); - this.userEmail=sysUser.getUserEmail(); - this.infoEmpNo=sysUser.getUserEmpNo(); + if (sysUser != null) { + this.userLoginName = sysUser.getUserLoginName(); + this.userPhone = sysUser.getUserPhone(); + this.userEmail = sysUser.getUserEmail(); + this.infoEmpNo = sysUser.getUserEmpNo(); + this.userStatus = sysUser.getUserStatus(); + } else { + this.userLoginName = "用户账号不存在"; + } return this; } public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){ - this.infoName=sysUserInfo.getName(); - this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd(); - this.positionNameRdd=sysUserInfo.getPositionNameRdd(); - this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd(); - this.infoEmployeeType=sysUserInfo.getUserEmployeeType(); - this.infoGrade=sysUserInfo.getUserGrade(); - this.infoSex=sysUserInfo.getUserSex(); - this.infoMarriage=sysUserInfo.getUserMarriage(); - this.infoCardType=sysUserInfo.getUserCardType(); - this.infoCardNumber=sysUserInfo.getUserCardNumber(); - this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession(); - this.infoSchool=sysUserInfo.getUserSchool(); - this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation(); - this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate(); - this.infoBirthplace=sysUserInfo.getUserBirthplace(); - this.infoRace=sysUserInfo.getUserRace(); - this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact(); - this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone(); - this.infoJoinDate=sysUserInfo.getUserJoinDate(); - this.infoResignationDate=sysUserInfo.getUserResignationDate(); - this.infoBornDate=sysUserInfo.getUserBornDate(); - this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus(); - this.infoHobby=sysUserInfo.getUserHobby(); - this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress(); + if (sysUserInfo != null) { + this.infoName = sysUserInfo.getName(); + this.departmentNameRdd = sysUserInfo.getDepartmentNameRdd(); + this.positionNameRdd = sysUserInfo.getPositionNameRdd(); + this.organizeNameRdd = sysUserInfo.getOrganizeNameRdd(); + this.infoEmployeeType = sysUserInfo.getUserEmployeeType(); + this.infoGrade = sysUserInfo.getUserGrade(); + this.infoSex = sysUserInfo.getUserSex(); + this.infoMarriage = sysUserInfo.getUserMarriage(); + this.infoCardType = sysUserInfo.getUserCardType(); + this.infoCardNumber = sysUserInfo.getUserCardNumber(); + this.infoSchoolProfession = sysUserInfo.getUserSchoolProfession(); + this.infoSchool = sysUserInfo.getUserSchool(); + this.infoSchoolEducation = sysUserInfo.getUserSchoolEducation(); + this.infoSchoolLeaveDate = sysUserInfo.getUserSchoolLeaveDate(); + this.infoBirthplace = sysUserInfo.getUserBirthplace(); + this.infoRace = sysUserInfo.getUserRace(); + this.infoEmergencyContact = sysUserInfo.getUserEmergencyContact(); + this.infoEmergencyPhone = sysUserInfo.getUserEmergencyPhone(); + this.infoJoinDate = sysUserInfo.getUserJoinDate(); + this.infoResignationDate = sysUserInfo.getUserResignationDate(); + this.infoBornDate = sysUserInfo.getUserBornDate(); + this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); + this.infoHobby = sysUserInfo.getUserHobby(); + this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + this.organizeCode=sysUserInfo.getOrganizeCode(); + this.createDatetime=sysUserInfo.getCreateDatetime(); + this.createUser=sysUserInfo.getCreateUser(); + this.modifyDatetime=sysUserInfo.getModifyDatetime(); + this.modifyUser=sysUserInfo.getModifyUser(); + } else { + this.infoName = "用户消息不存在"; + } return this; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java new file mode 100644 index 0000000..f5985dc --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-13 17:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_SOFT_UPDATE_RECORD") +@ApiModel(value="软件更新记录",description = "软件更新记录") +public class SysSoftUpdateRecord extends BaseBean { + + @Column(name="SYSTEM_SOFT_TYPE") + @ApiParam(value ="系统软件类型") + private Integer systemSoftType; + + public String getSystemSoftTypeTxt(){ + return systemSoftType == null ? "无" : CommonEnumUtil.SOFT_TYPE.valueOfDescription(systemSoftType); + } + + @Column(name="SYSTEM_VERSION") + @ApiParam(value ="系统版本") + private String systemVersion; + + @Lob + @Column(name="UPDATE_CONTENT") + @ApiParam(value ="更新内容") + private String updateContent; + + @Column(name="FIRST_DEPLOYMENT_TIME") + @ApiParam(value ="首次部署时间") + private String firstDeploymentTime; + + @Transient + private Map> updateDetailMap; + + public void putUpdateDetail(String detailType, String detail) { + if(updateDetailMap == null){ + updateDetailMap = new HashMap<>(); + } + + List detailList; + if (updateDetailMap.containsKey(detailType)) { + detailList = updateDetailMap.get(detailType); + } else { + detailList = new ArrayList<>(); + updateDetailMap.put(detailType, detailList); + } + + detailList.add(detail); + } + + public void transformUpdateDetail() { + this.updateContent = JSON.toJSONString(updateDetailMap); + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java new file mode 100644 index 0000000..9b9953c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSoftUpdateRecord; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-14 13:15 + * @Modify: + **/ +public interface SysSoftUpdateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java index f74a350..614b9a7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; + +import javax.persistence.LockModeType; /** * @Description : 设备类型 @@ -11,4 +15,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SysToolType; * @Modify : **/ public interface SysToolTypeRepository extends BaseRepository { + + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query(value = "from SysToolType where id = ?1") + SysToolType getByIds(Long id); + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e0c1886..ff6f6bc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1210,4 +1210,26 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSoftUpdateRecord.getFirstDeploymentTime(), "firstDeploymentTime", ddlPackBean, false, + true); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 52fb00f..4ca4350 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : MES_生产计划主表 @@ -86,6 +87,10 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") private Integer workOrderPlanStatus; + @Transient + @ApiParam("是否要从拉动计算中扣除") + private boolean needMinutPullQty = false; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 2ad5530..8902313 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String areaNo; + @Transient + @ApiParam("存储区") + @AnnoOutputColumn(hidden = true) + public String basZoneNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } - public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) { this.zoneNo = zoneNo; + this.basZoneNo = basZoneNo; this.areaNo = areaNo; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 68738c4..fda0174 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @ApiParam(value = "jis料架号") private String queueGroupNo; + @Transient + @ApiParam(value = "来源存储区/目标存储区") + private Integer srcOrDestZoneno; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 143f6d8..530005d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -401,4 +401,12 @@ public class WmsMoveSn extends BaseBean { this.srcSnStatus = srcSnStatus; this.destSnStatus = destSnStatus;; } + + + public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + this.sn = sn; + this.refSrc = refSrc; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index a587db3..6dafc68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean { @Transient private Integer isSnapshot; + + @Transient + @ApiParam(value = "应有数量") + private Double theoryQty; + + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; } @@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.sumQty = sumQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.totalQty = totalQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index bce6ced..1840675 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,13 +72,18 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; - - /** - * 分钟 - **/ - @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0") + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer advancePullTimes; + private Integer preReadyMinute; + + @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") + @ApiParam(value = "拉动区间时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer pullRangeMinute; + @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") + @ApiParam(value = "下次拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private String nextPullTime; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index a5a55d2..e651958 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -39,11 +39,18 @@ public class WmsAutoPurchasePartModel extends Pager { @ApiParam("供应商名称") private String vendorName; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("要货时间") + private String arriveTime; + + private Integer preReceivingDay; + + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty; this.erpWarehouse = warehouse; + this.preReceivingDay = preReceivingDay; } public WmsAutoPurchasePartModel() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ef66f02..4e8f778 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1203,8 +1203,15 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { + List columnNames = new ArrayList<>(); + columnNames.add("srcZoneNo"); + columnNames.add("destZoneNo"); + DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + } else { + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/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=./