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 880a811..0d49de6 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 @@ -491,7 +491,7 @@ public class WmsEnumUtil { } /** - * 外部单据：移库单业务类型 + * 移库单业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OUT_MOVEMENT_BUSI_TYPE { 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 7058997..2de8339 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 @@ -37,16 +37,16 @@ public class WmsMoveMaster extends BaseBean { * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, * MI=移库入库,MO=移库出库,SO=发运 */ - @Column(name="TYPE") + @Column(name="ORDER_TYPE") @ApiParam("业务类型") - public String type; + public String orderType; /** * 状态:0=创建,5=待处理,10=已处理 */ - @Column(name="STATUS") + @Column(name="ORDER_STATUS") @ApiParam(value = "状态", example = "0") - public Integer status; + public Integer orderStatus; @Column(name="REMARK") @ApiParam("备注") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.java new file mode 100644 index 0000000..51c61fe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMasterRepository.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.WmsMoveMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存移动单主表信息接口 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-18 10:10 + * @Modify: + **/ +@Repository +public interface WmsMoveMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.java new file mode 100644 index 0000000..d98f17e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackAgeRepository.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.WmsPackage; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物料包装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-18 14:46 + * @Modify: + **/ +@Repository +public interface WmsPackAgeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.java new file mode 100644 index 0000000..84f60c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockQuanRepository.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.WmsStockQuan; + +/** + * @Description :库存dao层 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 17:08 + * @Modify: + **/ +public interface WmsStockQuanRepository 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 36d5814..bb276e4 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 @@ -834,6 +834,51 @@ public class WmsHqlPack { } /** + * 业务：物料包装查询封装 + * + * @param wmsPackage + * @return + */ + public static String packWmsPackAge(WmsPackage wmsPackage) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); + HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + HqlPack.getStringEqualPack(wmsPackage.getSn(), "sn", result); + HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); + + getStringBuilderPack(wmsPackage, result); + + return result.toString(); + } + /** + *内部单据：库存移动单主表唯一性查询 + * @param wmsMoveMaster + * @return + */ + 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(); + } + + /** + * 内部单据：库存移动单主表分页查询 + * @param wmsMoveMaster + * @return + */ + 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 wmsQCMaster @@ -885,5 +930,4 @@ public class WmsHqlPack { getStringBuilderPack(wmsQCTrans, result); return result.toString(); } - }