From f456ff2f758916e6a16e732893b4ad14e7c778be Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 21 Dec 2018 22:01:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../estsh/i3plus/pojo/model/wms/InputSnModel.java | 30 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../pojo/wms/repository/WmsMoveSnRepository.java | 9 +++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.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 90e61fe..d2270cb 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 @@ -1192,7 +1192,7 @@ public class WmsEnumUtil { } /** - * 库存移动单状态 状态:0=创建,5=待处理,10=已处理 + * 库存移动单状态 状态:1=创建,10=待处理,20=已处理 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java new file mode 100644 index 0000000..8d32f13 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 扫描条码获取参数实体【使用：入库上架】 + * @Reference : + * @Author : amy + * @CreateDate : 2018-12-21 14:53 + * @Modify: + **/ +@Data +public class InputSnModel { + + @ApiParam(value = "单号") + public String orderNo; + + @ApiParam(value = "条码") + private String sn; + + @ApiParam(value = "库位代码") + public String locateNo; + + @ApiParam(value = "是否分组") + public String isGroup; + + @ApiParam(value = "工厂代码") + public String organizeCode; +} 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 978d821..5071921 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 @@ -89,7 +89,7 @@ public class WmsMoveDetails extends BaseBean { public String destLocateNo; /** - * 状态:0=创建,5=待处理,10=已处理 + * 状态:1=创建,10=待处理,20=已处理 */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "0") 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 index 6edff0c..897d25c 100644 --- 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 @@ -2,6 +2,8 @@ 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.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; /** @@ -13,4 +15,11 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface WmsMoveSnRepository extends BaseRepository { + + @Query("select count(id) from WmsMoveSn where destLocateNo = :destLocateNo and itemStatus in (:createStatus,:dealStatus)" + + " and organizeCode = :organizeCode and isValid = :isValid and isDeleted = :isDeleted") + int getCountByLocateNoAndStatus(@Param("destLocateNo")String destLocateNo,@Param("createStatus")String createStatus, + @Param("dealStatus")String dealStatus,@Param("organizeCode")String organizeCode, + @Param("isValid")int isValid, @Param("isDeleted")int isDeleted); + } From 93ff5ad071a6630fc6b07031d36a0ddb53ca83dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sat, 22 Dec 2018 16:10:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/InStockCOInfoModel.java | 23 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 17 ++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java new file mode 100644 index 0000000..b4838d1 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 入库上架任务回显模型 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-12-21 10:14 + * @Modify: + **/ +@Data +public class InStockCOInfoModel { + + // 物料编码 + private String partNo; + + // 待上架箱数 + private Integer waitingCounts; + + // 已上架箱数 + private Integer finishedCounts; +} 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 eba7c3e..a144569 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单条码信息 @@ -82,4 +83,20 @@ public class WmsMoveSn extends BaseBean { @Column(name="DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; + + @ApiParam("待上架箱数") + @Transient + private long waitingCounts; + + @ApiParam("已上架箱数") + @Transient + private long finishedCounts; + + public WmsMoveSn(){} + + public WmsMoveSn(String partNo, long finishedCounts ,long waitingCounts){ + this.partNo = partNo; + this.waitingCounts = waitingCounts; + this.finishedCounts = finishedCounts; + } } From 294560df402de8ec806a695ee9786f6bed39e3f7 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 23 Dec 2018 18:01:56 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsMoveSnRepository.java | 7 ------- 1 file changed, 7 deletions(-) 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 index 897d25c..ab104be 100644 --- 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 @@ -15,11 +15,4 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface WmsMoveSnRepository extends BaseRepository { - - @Query("select count(id) from WmsMoveSn where destLocateNo = :destLocateNo and itemStatus in (:createStatus,:dealStatus)" + - " and organizeCode = :organizeCode and isValid = :isValid and isDeleted = :isDeleted") - int getCountByLocateNoAndStatus(@Param("destLocateNo")String destLocateNo,@Param("createStatus")String createStatus, - @Param("dealStatus")String dealStatus,@Param("organizeCode")String organizeCode, - @Param("isValid")int isValid, @Param("isDeleted")int isDeleted); - } From 9e49372cf553a56c51308fea6f4e8a475539c581 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 24 Dec 2018 10:51:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hql=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A7=84=E8=8C=83=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java | 4 ++-- .../i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index 430e521..525c876 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -17,7 +17,7 @@ import java.util.List; **/ public interface WmsIbCheckPlanRepository extends BaseRepository { - @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") + /* @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") List findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); - +*/ } 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 index 0a5abf6..f7728db 100644 --- 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 @@ -22,19 +22,19 @@ public interface WmsMoveDetailsRepository extends BaseRepository :status") int getCountNotInStatus(@Param("organizeCode")String organizeCode, @Param("isValid")int isValid, @Param("isDeleted")int isDeleted,@Param("status")int status); - +*/ } From e4a2c6a5ebc7e31535b692134ca8dfe3a6f886de Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Mon, 24 Dec 2018 19:34:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 5071921..39c3971 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单明细信息 @@ -105,4 +106,20 @@ public class WmsMoveDetails extends BaseBean { @Column(name="REF_SRC") @ApiParam("关联单号") public String refSrc; + + @ApiParam("待出库数量") + @Transient + private long waitingCounts; + + @ApiParam("已出库数量") + @Transient + private long finishedCounts; + + public WmsMoveDetails(){} + + public WmsMoveDetails(String partNo, long waitingCounts ,long finishedCounts){ + this.partNo = partNo; + this.waitingCounts = waitingCounts; + this.finishedCounts = finishedCounts; + } } From 5d7e5567bedf91b9fc1c52d5badccee5021e12b8 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 25 Dec 2018 11:04:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=80=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c04edf2..3268ddd 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 @@ -33,7 +33,7 @@ public class WmsMoveMaster extends BaseBean { public String orderNo; /** - * 状态:0=创建,5=待处理,10=已处理 + * 状态:1=创建,10=待处理,20=已处理 */ @Column(name="ORDER_STATUS") @ApiParam(value = "状态", example = "0") From 6b06d3ff04eddfe7cd52f3d43449fc79fe1ff522 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 25 Dec 2018 16:52:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E5=85=B8=E9=A1=B9=20ics=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 1 - .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 10 +++++++--- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 692e9ff..54dacc8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -43,7 +43,6 @@ public class PagerHelper { } private static Pager getPager(int pageSize, int currentPage, int totalRows) { - // TODO 10可用系统参数替换 pageSize = pageSize == 0 ? 10 : pageSize; Pager pager = new Pager(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 2b8ab16..5829675 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -33,7 +33,7 @@ public class SysDictionary extends BaseBean { @Column(name="NAME") @ApiParam(value ="字典名称") private String name; - + @Column(name="DICTIONARY_CODE") @ApiParam(value ="字典代码") private String dictionaryCode; @@ -55,11 +55,15 @@ public class SysDictionary extends BaseBean { @Column(name="DICTIONARY_VALUE") @ApiParam(value ="字典值") private String dictionaryValue; - + @Column(name="DICTIONARY_SORT") @ApiParam(value ="排序" , example ="1") private Integer dictionarySort; - + + @Column(name="IS_DEFAULT") + @ApiParam(value = "是否默认",example = "2") + private Integer isDefault; + @Column(name="DICTIONARY_DESCRIPTION") @ApiParam(value ="描述") private String dictionaryDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c3dbd1b..8706443 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -263,6 +263,7 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result); HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false); + HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result); return result.toString(); } @@ -276,7 +277,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(file.getName(),"name",result); + HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); @@ -362,6 +363,7 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); @@ -478,11 +480,11 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); return result.toString(); }