Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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 {

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

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")

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