Merge remote-tracking branch 'origin/master'

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;
+}

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;
 }

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<WmsIbCheckPlan, Long> {
+
+    @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);
+
 }