diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 2bd1dae..b2977bb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4287,7 +4287,8 @@ public class WmsEnumUtil { REPORT(10, "REPORT", "生产报工"), BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"), - PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"); + PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"), + SHIP_CHECK(50, "SHIP_CHECK", "发运校验"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index c695604..82bfdf1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -3,8 +3,10 @@ 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.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,8 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") @@ -75,6 +79,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "STOCK_QTY") + @ApiParam("排程实时库存") + private Integer stockQty; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d55e918..4d0bcef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -350,6 +350,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("是否虚拟件") private Integer isFictive = 2; + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("行颜色") + private String rowColor; + 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/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 66a0859..8dc57e7 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 @@ -102,6 +102,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("客户产线代码") private String custProdLineCode; + @ApiParam("JIT排序号") + private String jitSeq; + private Integer status; public QueueOrderModel() { } @@ -309,7 +312,8 @@ public class QueueOrderModel implements Serializable { //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { + Double queueSeq, Double queDetailSeq, String partNo, + String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -320,6 +324,7 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; + this.serialNumber = serialNumber; } // getQueueOrderBySerialNumber @@ -332,4 +337,17 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.workType = workType; } + + // getQueueJitActualJitSeq + public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) { + this.id = id; + this.queueSeq = queueSeq; + this.serialNumber = serialNumber; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + this.status = status; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java index 7a612b3..87d933d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; - /** * @Description : 生产领料计划 * @Reference : @@ -22,5 +20,5 @@ public class MesPPMasterModel { private MesPpMaster mesPpMaster; @ApiParam("生产计划明细数据") - private List mesPpDetailsList; + private MesPpDetails mesPpDetails; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 7d1d04e..b0ac2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam(value = "版本") - private String version; + private Integer version; public WmsDocMovementSn(){} @@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, - String whNo,String erpSrcNo,String version,Double sumQty) { + String whNo,String erpSrcNo,Integer version,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String custNo, + Integer version,String whNo,String custNo, String erpSrcNo,String planDate,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; @@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean { this.snStatus = snStatus; this.sumQty = sumQty; } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.erpSrcNo = erpSrcNo; + this.vendorNo = vendorNo; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.planDate = planDate; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 78806fe..1e55325 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name = "ORDER_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @ApiParam(value = "状态", example = "0") public Integer orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..8c80c2a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -173,6 +173,10 @@ public class WmsPOMaster extends BaseBean { private Integer boardStatus; @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -195,6 +199,11 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Transient + @ApiParam("周总数") + private Integer weekRcCount; + + public WmsPOMaster() { } @@ -219,6 +228,17 @@ public class WmsPOMaster extends BaseBean { this.planTime = planTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index df864de..8bddf7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -169,7 +169,7 @@ public class WmsPartExtend extends BaseBean { private Integer qcPassCount; @Column(name = "LAST_QC_TIME") - @ApiParam(value = "上次质检时间") + @ApiParam(value = "首次质检时间合格") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java new file mode 100644 index 0000000..9a2ae7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : AGV接口Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-10 20:21 + * @Modify: + **/ +@Data +@Api("AGV接口Model") +public class WmsAgvModel { + + @ApiParam(value = "任务ID") + private String taskId; + + @ApiParam(value = "源库位") + private String srcLocateNo; + + @ApiParam(value = "目标库位") + private String destLocateNo; + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "物料编号集合") + private List partNoList; + + @ApiParam(value = "目标库位编号集合") + private List destLocateNoList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 4f21a95..387aba1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; @ApiParam("小于今天的结果集") - private Map> ltCurrentDayResultMap; + private Map> ltCurrentDayResultMap; public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java new file mode 100644 index 0000000..432ab79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : PO明细回传汇总Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-12 13:56 + * @Modify: + **/ +@Data +@Api("PO明细回传汇总Model") +public class WmsPoCountModel { + + @ApiParam(value = "po单号") + private String poOrderNo; + + @ApiParam(value = "收货日期") + private String rcDate; + + @ApiParam(value = "源单号") + private String srcOrderNo; + + @ApiParam(value = "源行号") + private Integer srcItem; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "仓库") + private String whNo; + + @ApiParam(value = "汇总数量") + private Double sumQty; + + @ApiParam(value = "供应商批次") + private String venLotNo; + + @ApiParam(value = "操作人") + private String user; + + public WmsPoCountModel() { + } + + public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) { + this.poOrderNo = poOrderNo; + this.rcDate = rcDate; + this.srcOrderNo = srcOrderNo; + this.srcItem = srcItem; + this.lotNo = lotNo; + this.partNo = partNo; + this.partName = partName; + this.whNo = whNo; + this.sumQty = sumQty; + this.venLotNo = venLotNo; + this.user = user; + } +} 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 73d5512..ef66f02 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 @@ -18,6 +18,7 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -259,7 +260,6 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -277,10 +277,10 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } - - // 查询计划时间在指定范围的单号，查询这些单号的数据 - if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } else { + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); } //按创建时间查询单据信息