Merge remote-tracking branch 'remotes/origin/dev' into test

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();

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

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

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

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 : 库存移动单明细信息
@@ -89,7 +90,7 @@ public class WmsMoveDetails extends BaseBean {
     public String destLocateNo;
 
     /**
-     * 状态:0=创建,5=待处理,10=已处理
+     * 状态:1=创建,10=待处理,20=已处理
      */
     @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
@@ -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;
+    }
 }

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

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

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<WmsIbCheckPlan, Long> {
 
-    @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<WmsIbCheckPlan> findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date);
-
+*/
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java

@@ -22,19 +22,19 @@ public interface WmsMoveDetailsRepository extends BaseRepository<WmsMoveDetails,
      * @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);
 
-    /**
+    *//**
      * 获取不是指定状态的记录数
      * @param organizeCode
      * @param isValid
      * @param isDeleted
      * @param status
      * @return
-     */
+     *//*
     @Query("select count(id) from WmsMoveDetails where organizeCode = :organizeCode and isValid = :isValid and isDeleted = :isDeleted and status <> :status")
     int getCountNotInStatus(@Param("organizeCode")String organizeCode, @Param("isValid")int isValid, @Param("isDeleted")int isDeleted,@Param("status")int status);
-
+*/
 }

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;
 
 /**