From 62dcedc13342d6c563b309bfd41aceb21512ddd3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 30 Nov 2018 10:11:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/OptionModel.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java new file mode 100644 index 0000000..c26b6a6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 可选项模型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-30 10:50 + * @Modify: + **/ +@Data +public class OptionModel { + + private String code; + + private String name; + + private Boolean value; +} From d616af3a000f700f4431a05148d1d77781805d26 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 30 Nov 2018 11:45:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=BD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 04b5b62..7c9fba7 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 @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Date; /** * @Description : 抽点比例表 @@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; * @Modify: **/ public interface WmsIbCheckPlanRepository extends BaseRepository { + + @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and startDate<=:date and endDate>=:date") + WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("date") String date); + } From ac84f62e702ad42ca50476051ef781500aba4b8f Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 30 Nov 2018 13:10:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index d3cf503..2ab3567 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -52,6 +52,6 @@ public class WmsActionStepCall extends BaseBean { public transient String amDesc; @Column(name="AM_TYPE") - @ApiParam(value = "组件类型") - public transient Integer amType; + @ApiParam(value = "组件类型", example = "0") + public Integer amType; }