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 d710147..d895cf1 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 @@ -586,6 +586,16 @@ public class WmsEnumUtil { } return tmp; } + + 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; + } } @@ -903,6 +913,16 @@ public class WmsEnumUtil { return tmp; } + 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -953,6 +973,16 @@ public class WmsEnumUtil { return tmp; } + 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -1166,6 +1196,16 @@ public class WmsEnumUtil { } return tmp; } + + 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-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 61fb891..292d6ee 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 @@ -3,6 +3,7 @@ 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.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -150,6 +151,7 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") private Integer busiTypeCode; @Transient @@ -158,11 +160,11 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("父物料编码") - private String fPartNo; + private String fpartNo; @Transient @ApiParam("父物料名称") - private String fPartName; + private String fpartName; @Transient @ApiParam("数量") @@ -172,6 +174,16 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("创建时间") private String createDateTime; + /* @JSONField(name="fPartNo") + public String getfPartNo() { + return fPartNo; + } + + @JSONField(name="fPartName") + public String getfPartName() { + return fPartName; + }*/ + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -203,8 +215,8 @@ public class WmsMoveDetails extends BaseBean { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workCenterCode = workCenterCode; - this.fPartNo = fPartNo; - this.fPartName = fPartName; + this.fpartNo = fPartNo; + this.fpartName = fPartName; this.unit = unit; this.qty = qty; this.createDateTime = createDateTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 05347ae..40a2930 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -146,6 +146,28 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, + String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent=isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.partNo = partNo; + this.itemStatus = itemStatus; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.refSrc = refSrc; + this.organizeCode =organizeCode; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + } + public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) { this.id = id; 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 34efda9..e0b1590 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 @@ -164,9 +164,9 @@ public class WmsMoveSn extends BaseBean { @Transient @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") private Integer busiTypeCode; - @Transient @ApiParam(value = "交易类型代码") private String transTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index b2e283c..1c1dbdc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -92,7 +92,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") - @ApiParam(value = "收货检验否", example = "1") + @ApiParam(value = "是否免检", example = "1") private Integer iqc; @Column(name = "MIN") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 50c04d5..27f4a5a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 产品发运信息 @@ -26,94 +27,99 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_SHIPPING") +@Table(name = "WMS_DOC_SHIPPING") @Api("产品发运信息") public class WmsShipping extends BaseBean { private static final long serialVersionUID = 5760351204320621363L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("发运单号") public String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; /** * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "10") public Integer orderStatus; - @Column(name="REMARK") + @Transient + @ApiParam(value = "状态") + public List orderStatusList; + + @Column(name = "REMARK") @ApiParam("备注") public String remark; - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编码") public String custNo; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME") @ApiParam("发运时间") public String shippingTime; @Transient - @ApiParam(value ="客户简称") + @ApiParam(value = "客户简称") private String custName; @Transient @ApiParam(value = "发往地简称") private String flagName; - @Column(name="AREA_NO") + @Column(name = "AREA_NO") @ApiParam("ERP库存地") public String areaNo; - @Column(name="CAR_NO") + @Column(name = "CAR_NO") @ApiParam("车号") public String carNo; - @Column(name="ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE") @ApiParam("错误信息") public String errorMessage; - @Column(name="IS_LOCK") - @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + @Column(name = "IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定") public Integer isLock; - @Column(name="ERP_SYNC_FLAG") - @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + @Column(name = "ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败") public Integer erpSyncFlag; - public WmsShipping(){} + public WmsShipping() { + } - public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) { + public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) { this.id = id; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 16a7ce9..af7f9f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -95,6 +95,11 @@ public class WmsZones extends BaseBean { this.zoneNo = zoneNo; } + public WmsZones(String zoneNo,String areaNo){ + this.zoneNo = zoneNo; + this.areaNo = areaNo; + } + public WmsZones(){} } 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 4f0ca46..80f32e6 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 @@ -45,19 +45,18 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); - if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } return hqlStr; } /** - * * @param wmsFix * @return */ - public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){ + public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -77,9 +76,10 @@ public class WmsHqlPack { /** * 单位换算 分页查询 + * * @return */ - public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -175,11 +175,12 @@ public class WmsHqlPack { /** * 移库单号集合查询条件封装 + * * @param orderNoList * @param organizeCode * @return */ - public static DdlPackBean packWmsDocMovementMasterByOrderNos(List orderNoList,String organizeCode) { + public static DdlPackBean packWmsDocMovementMasterByOrderNos(List orderNoList, String organizeCode) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); @@ -616,6 +617,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result); //发运状态 DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); + //发运状态集合 + DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result); //特殊发货标志 DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); //单据来源 @@ -1305,6 +1308,10 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); getStringBuilderPack(wmsCSOrderDetails, result); @@ -1323,6 +1330,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); getStringBuilderPack(wmsCSFactTrans, result); @@ -2067,7 +2077,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ - DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); + DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); getStringBuilderPack(wmsCSRange, result); return result; @@ -2240,19 +2250,19 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); // 库位不为空 - DdlPreparedPack.getStringNotNullPack( "locateNo", result); - DdlPreparedPack.getStringNoEqualPack("","locateNo", result); + DdlPreparedPack.getStringNotNullPack("locateNo", result); + DdlPreparedPack.getStringNoEqualPack("", "locateNo", result); // 排除创建及出库状态条码 - if(wmsStockSn.getSnStatus() != null){ + if (wmsStockSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); } - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getNumberBiggerPack(0, "qty", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); @@ -2282,13 +2292,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); - if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") - || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "") + || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) { DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true); } - if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") - || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ + if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) { DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); } @@ -2332,9 +2342,10 @@ public class WmsHqlPack { /** * 单位换算 分页查询 + * * @return */ - public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){ + public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) { DdlPackBean result = new DdlPackBean(); //查询参数封装