diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0d0e9c0..4d003e2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1047,4 +1047,38 @@ public class ImppEnumUtil { return tmp; } } + + //messageReceiverType + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_RECEIVER_TYPE { + INTERNAL(1, "内部人员接收"), + EXTERNAL(2, "外部人员接收"), + URGENT(3, "紧急联系人接收"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private MESSAGE_RECEIVER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 24763f0..e975c42 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,6 +29,11 @@ i3plus-pojo-report + + i3plus.pojo + i3plus-pojo-wms + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java deleted file mode 100644 index fdf6c5f..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 流程管家模型 - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2018-11-28 15:50 - * @Modify: - **/ -@Data -public class ActionButlerModel { - - private String orderNo; - - private String sn; - - private String aLId; - - private String userNo; - - private String fixNo; - - private String barCode; - - private String funCallName; -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java new file mode 100644 index 0000000..d885242 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动明细模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveDetailsModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String vendorNo; + + public String custNo; + + public Double qty; + + public Double transQty; + + public String unit; + + public String srcWhNo; + + public String srcZoneNo; + + public String srcLocateNo; + + public String destWhNo; + + public String destZoneNo; + + public String destLocateNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + /** + * ASN,PO,SO + */ + public Integer refType; + + public String refSrc; + + private List moveDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java new file mode 100644 index 0000000..5c7bddf --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveMasterModel { + public String orderNo; + + public Integer orderStatus; + + public String reMark; + + private String transTypeCode; + + private List moveDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java new file mode 100644 index 0000000..5d44741 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动条码模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveSnModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String unit; + + public String sn; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + public String reMark; + + public String lotNo; + + public String packAgeNo; + + public Double qty; + + public String srcLocateNo; + + public String destLocateNo; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 32d44bc..85501de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -55,6 +55,10 @@ public class SysConfig extends BaseBean { @ApiParam(value ="参数值") private String configValue; + @Column(name="CONFIG_VALUE_OPTION") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + private String configValueOption; + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="参数描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index be4d80c..978c2d1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -55,8 +55,12 @@ public class SysMessage extends BaseBean { @ApiParam(value ="发送者名称" ) private String messageSenderNameRdd; + @Column(name="MESSAGE_RECEIVER_TYPE") + @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") + private Integer messageReceiverType; + @Column(name="MESSAGE_RECEIVERS_ID") - @ApiParam(value ="发送者id" ) + @ApiParam(value ="收件者id" ) private String messageReceiversId; @Column(name="MESSAGE_RECEIVERS_NAME_RDD") diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 31ca821..7ee32b2 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -16,11 +16,6 @@ i3plus.pojo - i3plus-pojo-model - - - - i3plus.pojo i3plus-pojo-base diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index d87e915..ce8cd86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -45,7 +43,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public List options; + public List options; @ApiParam("选中的明细数据") public Obj details; 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 0a7d5f2..f1016d5 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 @@ -72,9 +72,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name="QTY") - @ApiParam(value = "已收数量", example = "0") - public Double qty; + @Column(name="SRC_QTY") + @ApiParam(value = "源数量", example = "0") + public Double srcQty; @Column(name="SRC_LOCATE_NO") @ApiParam("源库位代码") @@ -92,6 +92,14 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; + @Column(name="DEST_QTY") + @ApiParam(value = "目标数量", example = "0") + public Double destQty; + + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 1fbbbf4..b572de7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -1,13 +1,11 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java similarity index 89% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 7ab343e..fa5063d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: **/ @Data -public class OptionModel { +public class WmsOptionModel { private String code; 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 c019a19..48154b2 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 @@ -106,4 +106,8 @@ public class WmsPart extends BaseBean { @Column(name="LOT_CHECK_RULE") @ApiParam(value ="批次校验规则") private String lotCheckRule; + + @Column(name="IN_LOCATE_NO") + @ApiParam(value ="默认入库库位") + private String inLocateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 1ef80a0..a35f07d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "TOTAL_QTY") - @ApiParam(value = "总数量", example = "0") - private Double totalQty; + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } 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 28155ba..b95a679 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 @@ -24,8 +24,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * - * @param bean 实体对象 + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -66,7 +65,7 @@ public class WmsHqlPack { } /** - * 库存移库单明细查询封装 + * 库存移动单详情查询封装 * * @param wmsDocMovementDetails * @return @@ -81,7 +80,6 @@ public class WmsHqlPack { return result.toString(); } - /** * 查询任务合并的移库单明细 查询条件封装 * @@ -103,7 +101,6 @@ public class WmsHqlPack { "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo"); return result.toString(); } - /** * 库存移动单查询封装 * @@ -212,10 +209,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); - if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { + if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { + if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } @@ -402,11 +399,11 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + getStringBuilderPack(wmsOpType, result); return result.toString(); } - /** * 查询满足处理周期的作业类型 查询条件封装 * @@ -437,7 +434,6 @@ public class WmsHqlPack { return result.toString(); } - /** * 存储区信息 查询条件封装 * @@ -454,7 +450,7 @@ public class WmsHqlPack { //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); getStringBuilderPack(wmsZones, result); @@ -520,7 +516,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - getStringBuilderPack(wmsASNMaster, result); + getStringBuilderPack(wmsASNMaster,result); return result.toString(); } @@ -599,7 +595,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails, result); + getStringBuilderPack(wmsASNMasterDetails,result); return result.toString(); } @@ -657,7 +653,6 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 - * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -680,11 +675,10 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 - * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -697,16 +691,15 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 - * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); getStringBuilderPack(wmsCSPart, result); @@ -715,11 +708,10 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 - * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -732,7 +724,6 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 - * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -759,7 +750,6 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 - * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -870,18 +860,16 @@ public class WmsHqlPack { return result.toString(); } - /** - * 内部单据：库存移动单主表唯一性查询 - * + *内部单据：库存移动单主表唯一性查询 * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); getStringBuilderPack(wmsMoveMaster, result); @@ -890,15 +878,14 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 - * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); @@ -907,11 +894,10 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 - * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -921,15 +907,15 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); getStringBuilderPack(wmsMoveDetails, result); @@ -938,11 +924,10 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 - * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1162,10 +1147,9 @@ public class WmsHqlPack { /** * 作业流程分页查询 - * * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ StringBuffer result = new StringBuffer(); //查询参数封装 agDescC;agNameC @@ -1178,10 +1162,9 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 - * * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ StringBuffer result = new StringBuffer(); //查询参数封装 @@ -1228,7 +1211,6 @@ public class WmsHqlPack { /** * 作业记录 查询条件封装 - * * @param wmsActionLog * @return */ @@ -1236,19 +1218,19 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); + HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); getStringBuilderPack(wmsActionLog, result); @@ -1257,16 +1239,15 @@ public class WmsHqlPack { /** * 作业记录明细 查询条件封装 - * * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ StringBuffer result = new StringBuffer(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); @@ -1298,15 +1279,14 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 - * + * 按moveNo 取最后一笔插入的数据 * @param wmsMoveSn * @return */ public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); getStringBuilderPack(wmsMoveSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); @@ -1314,21 +1294,30 @@ public class WmsHqlPack { } /** - * 根据条件查询库存条码信息 - * + * 根据条件查询库存条码信息 * @param wmsStockSn * @return */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(), "sn2d", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); + HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); getStringBuilderPack(wmsStockSn, result); + return result.toString(); + } + /** + * 根据条件查询库存信息 + * @param wmsStockQuan + * @return + */ + public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + getStringBuilderPack(wmsStockQuan, result); return result.toString(); } }