Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

@@ -53,6 +53,6 @@ public class WmsMoveMaster extends BaseBean {
     public String reMark;
 
     @Column(name = "TRANS_TYPE_CODE")
-    @ApiParam("交易代码")
-    public String transCode;
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.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.WmsMoveDetails;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 /**
  * @Description : 库存移动单明细信息
@@ -11,4 +13,15 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
  * @Modify:
  **/
 public interface WmsMoveDetailsRepository extends BaseRepository<WmsMoveDetails, Long> {
+
+    /**
+     * 获取item最大值
+     * @param organizeCode
+     * @param isValid
+     * @param isDeleted
+     * @return
+     */
+    @Query("select max(item) from WmsMoveDetails where organizeCode = :organizeCode and isValid = :isValid and isDeleted = :isDeleted")
+    int getMaxItem(@Param("organizeCode")String organizeCode, @Param("isValid")int isValid, @Param("isDeleted")int isDeleted);
+
 }