From 64ea8f7fab99526be7da6eee98fea90deff00a13 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Sun, 18 Nov 2018 16:50:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E7=9B=98=E7=82=B9=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 231 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 6 +- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 10 +- .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 14 +- .../wms/repository/WmsCSFactTransRepository.java | 14 ++ .../repository/WmsCSOrderDetailsRepository.java | 15 ++ .../wms/repository/WmsCSOrderMasterRepository.java | 14 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 49 +++++ 8 files changed, 338 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java 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 217cdd0..012b8a4 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 @@ -794,6 +794,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 外部单据：移库单关联单据类型 */ @@ -839,4 +840,234 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 盘点主表 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ORDER_TYPE { + DAY_INVENTORY(10, "日常盘点"), + MONTH_INVENTORY(20, "月度盘点"), + SEASON_INVENTORY(30, "季度盘点"), + YEAR_INVENTORY(40, "年度盘点"); + + private int value; + private String description; + + CS_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** + * 盘点主表 盘点状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ORDER_STATUS { + CREATE(1, "创建"), + FROZEN(10, "已冻结"), + IN_INVENTORY(20, "盘点中"), + INVENTORY_FINISH(30, "盘点完成"), + THAWING(40, "已解冻"), + CLOSED(50, "已关闭"); + + private int value; + private String description; + + CS_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** + * 盘点冻结 质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + NO_QC(1, "未质检"), + IN_QC(10, "质检中"), + QUALIFIED_QC(20, "质检合格"), + DISQUALIFIED_QC(30, "质检不合格"), + RETURN_GOODS(40, "已退货"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** + * 盘点冻结 条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_STATUS { + CREATE(1, "创建"), + RECEIVE_GOODS(10, "已收货"), + QUALITY_TESTING(20, "已质检"), + IN_STORE(30, "已入库"), + WAIT_STORE(40, "待出库"), + OUT_STORE(50, "已出库"), + ON_PASSAGE(60, "在途"), + QUARANTINE(70, "已隔离"), + BALE_BROKEN(80, "破包"), + FROZEN(90, "冻结"), + RETURN_GOODS(100, "取消冻结"); + + private int value; + private String description; + + SN_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** + * 盘点冻结 处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_TRANS_STATUS { + CREATE(1, "已创建"), + INVENTORY(5, "已盘"), + FROZEN(10, "已冻结"), + THAWING(20, "已解冻"), + RETURN_GOODS(30, "取消冻结"); + + private int value; + private String description; + + CS_TRANS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } + + /** + * 盘点实盘 处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_ITEM_STATUS { + CREATE(1, "创建"),FINISH(10, "已盘"); + + private int value; + private String description; + + CS_ITEM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1b9190c..7663880 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -69,11 +69,11 @@ public class WmsCSFactTrans extends BaseBean { public Double factQty; /** - * 状态:0=创建,10=已处理 + * 状态:1=创建,10=已处理 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer status; + public Integer itemStatus; @Column(name="REMARK") @ApiParam(value = "备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 0833e48..eadb67e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -65,7 +65,7 @@ public class WmsCSOrderDetails extends BaseBean { public String unit; /** - * 质检状态:0=未质检,10=质检中,20=质检合格, + * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 */ @Column(name="QC_STATUS") @@ -73,16 +73,16 @@ public class WmsCSOrderDetails extends BaseBean { public Integer qcStatus; /** - * 条码状态:0=创建,10=已收货,20=已质检, + * 条码状态:1=创建,10=已收货,20=已质检, * 30=已入库,40=待出库,50=已出库, * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ - @Column(name="STATUS") + @Column(name="SN_STATUS") @ApiParam(value = "条码状态", example = "1") - public Integer status; + public Integer snStatus; /** - * 处理状态:0=已创建,5=已盘,10=已冻结 + * 处理状态:1=已创建,5=已盘,10=已冻结 * ,20=已解冻,30=取消冻结 */ @Column(name="TRANS_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 50ac521..cfefd6b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -37,16 +37,16 @@ public class WmsCSOrderMaster extends BaseBean { * 30=季度盘点,40=年度盘点 */ @Column(name="ORDER_TYPE") - @ApiParam("单据类型") - public String orderType; + @ApiParam(value = "单据类型", example = "10") + public Integer orderType; - @Column(name="STATUS") - @ApiParam("状态") - public String status; + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1" ) + public Integer orderStatus; - @Column(name="PERSENT") + @Column(name="ACTION_PERSENT") @ApiParam("盘点进度") - public String persent; + public String actionPersent; @Column(name="REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java new file mode 100644 index 0000000..1a01441 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSFactTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSFactTrans; + +/** + * @Description : 盘点实盘信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 15:48 + * @Modify: + **/ +public interface WmsCSFactTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java new file mode 100644 index 0000000..90a63ca --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderDetailsRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderDetails; + +/** + * @Description : 盘点单冻结信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 14:33 + * @Modify: + **/ +public interface WmsCSOrderDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java new file mode 100644 index 0000000..73ef1fa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSOrderMasterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; + +/** + * @Description : 盘点单主表信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-18 11:55 + * @Modify: + **/ +public interface WmsCSOrderMasterRepository extends BaseRepository { +} 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 67388a3..eb8b3e4 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 @@ -667,4 +667,53 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 盘点单主表信息 分页查询 + * + * @param wmsCSOrderMaster + * @return + */ + public static String packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); + HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + + getStringBuilderPack(wmsCSOrderMaster, result); + + return result.toString(); + } + + /** + * 盘点单冻结表信息 分页查询 + * + * @param wmsCSOrderDetails + * @return + */ + public static String packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + getStringBuilderPack(wmsCSOrderDetails, result); + + return result.toString(); + } + + /** + * 盘点实盘表信息 分页查询 + * + * @param wmsCSFactTrans + * @return + */ + public static String packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + getStringBuilderPack(wmsCSFactTrans, result); + + return result.toString(); + } } From fecbfe821eb595c50f1570f798af078fa884c5ab Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 17:16:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 14 +++++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 +++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 47 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 11 deletions(-) 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 6a08fd8..1c0dfab 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 @@ -32,6 +32,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("单号") public String orderNo; + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + public Integer item; + @Column(name="PART_NO") @ApiParam("物料编码") public String partNo; @@ -40,6 +44,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + @Column(name="CUST_NO") @ApiParam("客户编号") public String custNo; @@ -71,16 +79,16 @@ public class WmsMoveDetails extends BaseBean { /** * 状态:0=创建,5=待处理,10=已处理 */ - @Column(name="STATUS") + @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer itemStatus; /** * ASN,PO,SO */ @Column(name="REF_TYPE") @ApiParam("关联单据类型") - public String refType; + public Integer refType; @Column(name="REF_SRC") @ApiParam("关联单号") 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 2de8339..8aeed96 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 @@ -38,8 +38,8 @@ public class WmsMoveMaster extends BaseBean { * MI=移库入库,MO=移库出库,SO=发运 */ @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; + @ApiParam(value = "业务类型", example = "0") + public Integer orderType; /** * 状态:0=创建,5=待处理,10=已处理 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 070b88c..5ec6c3c 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 @@ -44,17 +44,21 @@ public class WmsMoveSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - /** - * 状态:0=创建,10=已处理 - */ - @Column(name="STATUS") - @ApiParam(value = "状态", example = "0") - public Integer status; + @Column(name="UNIT") + @ApiParam(value = "单位") + public String unit; @Column(name="SN") @ApiParam("条码") public String sn; + /** + * 状态:0=创建,10=已处理 + */ + @Column(name="ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + public Integer itemStatus; + @Column(name="REMARK") @ApiParam("备注") public String reMark; 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 0f2af1b..6d3c73a 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 @@ -859,9 +859,11 @@ public class WmsHqlPack { */ public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); getStringBuilderPack(wmsMoveMaster, result); + return result.toString(); } @@ -872,9 +874,54 @@ public class WmsHqlPack { */ public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); getStringBuilderPack(wmsMoveMaster, result); + + return result.toString(); + } + + /** + * 内部单据：库存移动单明细表分页查询 + * @param wmsMoveDetails + * @return + */ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + getStringBuilderPack(wmsMoveDetails, result); + + return result.toString(); + } + + /** + * 内部单据：库存移动单条码信息分页查询 + * @param wmsMoveSn + * @return + */ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result); + HqlPack.getStringLikerPack(wmsMoveSn.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); + getStringBuilderPack(wmsMoveSn, result); + return result.toString(); } } From 8841e18a4d078c990ca871ef5c00e6367d90e3a7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 17:28:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsMoveDetailsRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsMoveSnRepository.java | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java new file mode 100644 index 0000000..fea096d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; + +/** + * @Description : 库存移动单明细信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 13:59 + * @Modify: + **/ +public interface WmsMoveDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java new file mode 100644 index 0000000..6edff0c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存移动单条码信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 15:24 + * @Modify: + **/ +@Repository +public interface WmsMoveSnRepository extends BaseRepository { +} From ccdfc19affd4ca8f2b3a6e5da6e6028a52bbdb39 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 18 Nov 2018 20:13:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 f684e42..1ac1c1e 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 @@ -1194,4 +1194,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库存移动单状态 状态:0=创建,5=待处理,10=已处理 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_ORDER_STATUS { + CREATE(0, "创建"),BE_HANDLE(5, "待处理"),FINISH(10, "已处理"); + + private int value; + private String description; + + MOVE_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } }