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 90cb863..ec7d0e5 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 @@ -1974,7 +1974,8 @@ public class MesEnumUtil { MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), - MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"); + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); private int value; private String service; @@ -3322,8 +3323,8 @@ public class MesEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; @@ -7179,4 +7180,41 @@ public class MesEnumUtil { return tmp; } } + + /** + * 通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_SIGN { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + NOTICE_SIGN(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; + } + + } } 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 47d87e1..28ed12b 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 @@ -1878,8 +1878,8 @@ public class MesPcnEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; 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..24d3342 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 @@ -1452,7 +1452,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_STRATEGY_TYPE { - PART_COVERAGE(110, "物料分类覆盖"), + MATERIAL_PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), MATERIAL_COVERAGE(140, "物料覆盖"); @@ -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; @@ -5062,6 +5063,58 @@ public class WmsEnumUtil { /** + * 生产计划主表计划状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_STATUS { + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "处理中"), + CLOSE(30, "CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_PLAN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 是否贵重物料 * 默认为2 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 56e17ba..e438425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -134,6 +134,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("工单类型") private Integer woType; + @Column(name = "OFFLINE_TIME") + @ApiParam("下线时间") + private String offlineTime; + + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private Integer noticeSign = 10; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; @@ -158,4 +166,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam(value = "零件号") + public String partNo; + } 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 51dc163..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 @@ -358,6 +358,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @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/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java new file mode 100644 index 0000000..917b27c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class FutrueTaskModel { + + @ApiParam("实现类") + private Object futrueTaskService; + + @ApiParam("包装条码") + private StationRequestBean stationRequestBean; + + @ApiParam("过程条码") + private MesProduceSn produceSn; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 95322a6..f310d79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2360,7 +2360,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2392,6 +2392,9 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + if(!CollectionUtils.isEmpty(orderList)){ + DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); + } DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } 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 0e69083..52fb00f 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 @@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String remark; + @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") + @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") + private Integer workOrderPlanStatus; + 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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0a332da..556316e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -521,7 +521,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.orderStatus = orderStatus; } - public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) { + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) { this.id = wmsDocMovementDetails.getId(); this.orderNo = wmsDocMovementDetails.getOrderNo(); this.partNo = wmsDocMovementDetails.getPartNo(); @@ -533,5 +533,6 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.boxQty = boxQty; + this.srcLocateNo = srcLocateNo; } } 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 942dfca..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 ''") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 21bf580..c9af9a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -545,6 +545,15 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; } + public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partName; + this.zoneNo = zoneNo; + this.unit = unit; + this.whNo = whNo; + } + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid public WmsStockSn(String locateNo, String partNo, Integer snStatus, Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { @@ -823,5 +832,19 @@ public class WmsStockSn extends BaseBean { this.fixLotNo = fixLotNo; } + public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) { + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partTypeDesc = partTypeDesc; + this.lotNo = lotNo; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.organizeCode = organizeCode; + } + } 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 241599c..bce6ced 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,4 +72,13 @@ 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") + @ApiParam(value = "提前拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer advancePullTimes; + } 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); } //按创建时间查询单据信息