diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java new file mode 100644 index 0000000..6c9aa12 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEnum.java @@ -0,0 +1,49 @@ +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: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ENUM") +@Api("MES_枚举表") +public class MesEnum extends BaseBean implements Serializable { + + private static final long serialVersionUID = 368174781823424116L; + + @Column(name = "ENUM_CODE") + @ApiParam("枚举代码") + private String enumCode; + + @Column(name = "ENUM_NAME") + @ApiParam("枚举名称") + private String enumName; + + @Column(name = "ENUM_VALUE") + @ApiParam("枚举值") + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam("枚举值描述") + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index a024e83..c0b3162 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -159,11 +159,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("Vin") private String vinCode; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 76c61d8..0db7bb7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -143,6 +143,22 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Column(name = "PROCESS_LABEL_TEMPLATE") + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java new file mode 100644 index 0000000..64ea242 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEnumRepository.java @@ -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.MesEnum; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesEnumRepository extends BaseRepository { +} 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 b8e2556..9f50d9d 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 @@ -3661,4 +3661,33 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesEnum(MesEnum mesEnum) { + DdlPackBean packBean = getAllBaseData(mesEnum.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumCode(), "enumCode", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumName(), "enumName", packBean); + DdlPreparedPack.getStringLikerPack(mesEnum.getEnumValue(), "enumValue", packBean); + DdlPreparedPack.getNumEqualPack(mesEnum.getIsValid(), "isValid", packBean); + return packBean; + } + + /** + * MES_看板产线配置查询条件封装 + * + * @param boardLine + * @return + */ + public static DdlPackBean getBoardLine(MesBoardLine boardLine) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLine.getOrganizeCode()); + if (!StringUtils.isEmpty(boardLine.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLine.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java new file mode 100644 index 0000000..51867fc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 北京麦格纳BBAC库存扣减MODEL + * @Reference + * @Author dragon + * @CreateDate 2020/11/22 14:46 + * @Modify + */ +@Data +@Api("北京麦格纳BBAC库存扣减MODEL") +public class WmsBjmgnBbacReductModel implements Serializable { + @ApiParam("JIS号") + public String jisNo; + @ApiParam("物料号") + public String partNo; + @ApiParam("项目编码") + public String projectNo; + @ApiParam("客户编码") + public String custNo; + @ApiParam("存储区") + public String zoneNo; + @ApiParam("ERP库存地") + public String erpAreaNo; + @ApiParam("项目名称") + public String projectName; + @ApiParam("数量") + public Double qty; + @ApiParam("单位") + public String unit; + + public WmsBjmgnBbacReductModel() { + } + + public WmsBjmgnBbacReductModel(String custNo,String zoneNo,String jisNo, String partNo, String projectNo, + Double qty, String unit) { + this.custNo = custNo; + this.zoneNo = zoneNo; + this.jisNo = jisNo; + this.partNo = partNo; + this.projectNo = projectNo; + this.qty = qty; + this.unit = unit; + } +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 50964f2..6575cee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -59,7 +59,7 @@ public class SwebHqlPack { } DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -81,11 +81,10 @@ public class SwebHqlPack { poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); - //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); DdlPreparedPack.getInPackList(poStatus, "poStatus", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(purchaseOrder, result); } @@ -94,7 +93,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebPackage, result); } @@ -102,7 +101,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebConfig, result); } @@ -121,7 +120,7 @@ public class SwebHqlPack { HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -134,7 +133,7 @@ public class SwebHqlPack { // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(model, result); } @@ -142,7 +141,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); } @@ -151,7 +150,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrderDetails, result); } @@ -159,7 +158,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); } @@ -208,22 +207,13 @@ public class SwebHqlPack { return buildHql(details, result); } -// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { -// DdlPackBean result = new DdlPackBean(); -// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); -// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); -// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); -// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); -// return buildHql(master, result); -// } - public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } @@ -242,7 +232,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(capcity.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(capcity, result); } @@ -260,7 +250,7 @@ public class SwebHqlPack { if (!StringUtil.isEmpty(alarm.getDateEnd())) { DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); } - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } @@ -272,7 +262,7 @@ public class SwebHqlPack { DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(stock, result); } @@ -285,7 +275,7 @@ public class SwebHqlPack { } DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(alarm, result); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index e34f49c..eac12a1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -17,6 +17,7 @@ import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; +import java.util.List; /** * @Description : PO订单明细信息 @@ -236,6 +237,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("汇总收货数量") private Double sumRcQty; + @Transient + @ApiParam("单据集合") + private List orderNoLst; + /** * 状态:1=新建,10=收货中,20=收货完成, 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 23fe0d2..4084304 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 @@ -537,6 +537,32 @@ public class WmsStockSn extends BaseBean { @ApiParam("原数量") private Double srcQty; + @Transient + @ApiParam("库位X") + private Integer x; + + @Transient + @ApiParam("库位Y") + private Integer y; + + @Transient + @ApiParam("库位Z") + private Integer z; + + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) { + this.sn = sn; + this.vendorNo = vendorNo; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.locateNo = locateNo; + this.x = x; + this.y = y; + this.z = z; + } + public WmsStockSn() { }