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 990384d..ce238d6 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 @@ -991,6 +991,51 @@ public class MesEnumUtil { } } + /** + * Mes 对象结构是否展示 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CFG_IS_SHOW { + + SHOW(1, "是"), + NO_SHOW(2, "否"); + + private int value; + private String description; + + OBJECT_CFG_IS_SHOW(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * Mes 客户订单来源 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 9f25f06..a63724c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否保存 1存 2不存") private Integer isSave; + @Column(name = "SHOW_SEQ") + @ApiParam("显示顺序") + private Integer showSeq; + + @Column(name = "IS_SHOW") + @ApiParam("是否显示") + private Integer isShow; + @Transient @ApiParam("是否存储名") private String isSaveName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 808c05f..2265b41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean { @ApiParam("父阶物料名称") private String parentPartName; + @ApiParam("实际包装数量") + private Integer compQty; + private List prodPackageList; private String partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 63903d3..b554be7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable { @ApiParam("产品条码") public String productSn; + @ApiParam("过程条码") + private String serialNumber; + // 包装主表--包装编号 @ApiParam("一检箱条码") public String packageNo; @@ -33,6 +36,9 @@ public class ProdPackModel implements Serializable { @ApiParam("箱条码状态") public Integer printStatus; + @ApiParam("打印状态") + public String printStatusDesc; + // 涂装客户标签打印 @ApiParam("客户标签") public String custSn; @@ -43,7 +49,7 @@ public class ProdPackModel implements Serializable { // 涂装客户标签打印 @ApiParam("更新时间") - public String modifyDateTime; + public String modifyDatetime; @ApiParam("工单号") public String workOrderNo; @@ -57,18 +63,18 @@ public class ProdPackModel implements Serializable { public ProdPackModel() { } - public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.createDatetime = createDatetime; this.printStatus = printStatus; } - public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.custSn = custSn; - this.processCode = processCode; - this.modifyDateTime = modifyDateTime; + this.printStatus = printStatus; + this.modifyDatetime = modifyDatetime; } } 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 f271030..5f310b4 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 @@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; - this.pptCode=pptCode; + this.pptCode = pptCode; + this.produceCategoryCode = produceCategoryCode; } + //getAlreadyQueueOrderModelNoSn - public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; - this.serialNumber=serialNumber; + this.serialNumber = serialNumber; } //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo @@ -251,7 +253,7 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; 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 b171b6d..3ec6403 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 @@ -954,6 +954,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); } + if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( 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 5ad3da6..a3f367b 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 @@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "检测结果ID") private Long summaryId; + @Transient + @ApiParam(value = "颜色") + private String color; + public WmsStockSn() { } @@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd, String workOrderCode) { + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -792,6 +796,7 @@ public class WmsStockSn extends BaseBean { this.prodCfgTypeName = prodCfgTypeName; this.custNameRdd = custNameRdd; this.workOrderCode = workOrderCode; + this.color = color; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java index 60bcda8..2935a37 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -100,30 +100,29 @@ public class WmsTractics extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String tracticsEndTime; - @Column(name="LEV1_STRATEGY") + @Column(name="LEV1_STRATEGY_PUT") @ApiParam(value ="1级策略上架") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") - private Integer lev1Strategy; + private Integer lev1StrategyPut; -// @Column(name="LEV1_STRATEGY") - @Transient + @Column(name="LEV1_STRATEGY_PICKING") @ApiParam(value ="1级策略拣货") @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") private Integer lev1StrategyPicking; - @Column(name="LEV2_STRATEGY") + @Column(name="LEV2_STRATEGY_PUT") @ApiParam(value ="2级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") - private Integer lev2Strategy; + private Integer lev2StrategyPut; - @Column(name="LEV3_STRATEGY") + @Column(name="LEV3_STRATEGY_PUT") @ApiParam(value ="3级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") - private Integer lev3Strategy; + private Integer lev3StrategyPut; // public String getIev1StrategyPicking (String lev1StrategyPicking) { // return this.lev1Strategy = lev1StrategyPicking; 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 4a0f756..d132855 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 @@ -1756,13 +1756,13 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { + /*public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { DdlPackBean result = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); - /*for (Map.Entry> map : entries) { + *//*for (Map.Entry> map : entries) { String key = map.getKey(); List valueList = map.getValue(); @@ -1785,22 +1785,24 @@ public class WmsHqlPack { packMutilConditionHql(mapList, "PART_NO", "partNo", result); } } - }*/ + }*//* //转换封装后的hql - /*String packedHql = result.getPackedHql(); + *//*String packedHql = result.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - result.setWhereAppend(packedHql);*/ + result.setWhereAppend(packedHql);*//* // 通用数据拼接 WmsDataAuth wmsDataAuth = new WmsDataAuth(); wmsDataAuth.setOrganizeCode(organizeCode); getStringBuilderPack(wmsDataAuth, result); return result; - } + }*/ + + /** * 把 List 中的一组数据重新封装到List中 @@ -1845,7 +1847,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { + /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql @@ -1865,13 +1867,13 @@ public class WmsHqlPack { } } //转换封装后的hql - /*String packedHql = packBean.getPackedHql(); + *//*String packedHql = packBean.getPackedHql(); if(packedHql.startsWith(" or")){ packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; System.out.println(packedHql); } - packBean.setWhereAppend(packedHql);*/ + packBean.setWhereAppend(packedHql);*//* DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); @@ -1880,7 +1882,7 @@ public class WmsHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); return packBean; - } + }*/ /** * 根据条件查询dataAuth