调整仓储费计算 出库、货转计算 与其余模块的不同，添加字典表字段

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -29,6 +29,10 @@ public class SysDictType extends BaseEntity
     @Excel(name = "字典类型")
     private String dictType;
 
+    /** 是否用户查看 */
+    @Excel(name = "是否用户查看")
+    private String dictAuthority;
+
     /** 状态（0正常 1停用） */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
@@ -67,6 +71,16 @@ public class SysDictType extends BaseEntity
         this.dictType = dictType;
     }
 
+    public String getDictAuthority()
+    {
+        return dictAuthority;
+    }
+
+    public void setDictAuthority(String dictAuthority)
+    {
+        this.dictAuthority = dictAuthority;
+    }
+
     public String getStatus()
     {
         return status;
@@ -76,13 +90,14 @@ public class SysDictType extends BaseEntity
     {
         this.status = status;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("dictId", getDictId())
             .append("dictName", getDictName())
             .append("dictType", getDictType())
+            .append("dictAuthority", getDictAuthority())
             .append("status", getStatus())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -5,19 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
 
 	<resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
-		<result property="dictName"   column="dict_name"   />
-		<result property="dictType"   column="dict_type"   />
-		<result property="status"     column="status"      />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
+		<result property="dictId"    column="dict_id"    />
+		<result property="dictName"    column="dict_name"    />
+		<result property="dictType"    column="dict_type"    />
+		<result property="dictAuthority"    column="dict_authority"    />
+		<result property="status"    column="status"    />
+		<result property="createBy"    column="create_by"    />
+		<result property="createTime"    column="create_time"    />
+		<result property="updateBy"    column="update_by"    />
+		<result property="updateTime"    column="update_time"    />
+		<result property="remark"    column="remark"    />
 	</resultMap>
 	
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
-		from sys_dict_type
+        select dict_id, dict_name, dict_type, dict_authority, status, create_by, create_time, update_by, update_time, remark
+ 		from sys_dict_type
     </sql>
 
 	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
@@ -32,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="dictType != null and dictType != ''">
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>
+			<if test="dictAuthority != null  and dictAuthority != ''">
+			 	and dict_authority = #{dictAuthority}
+			 </if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 			</if>
@@ -76,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		<set>
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="status != null">status = #{status},</if>
+			<if test="dictAuthority != null">dict_authority = #{dictAuthority},</if>
+			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
@@ -88,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>
+			<if test="dictAuthority != null">dict_authority,</if>
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
@@ -95,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)values(
  			<if test="dictName != null and dictName != ''">#{dictName},</if>
  			<if test="dictType != null and dictType != ''">#{dictType},</if>
+			<if test="dictAuthority != null">#{dictAuthority},</if>
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1277,6 +1277,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             long fInventoryDays = 0L;
             if ("SJCK".equals(fBilltype)) {
                 fInventoryDays = DateUtils.getDateDay((Date) item.get("fBsdate"), (Date) item.get("fOriginalbilldate"));
+            } else if ("HQZY".equals(fBilltype)) {
+                fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fBsdate"));
             } else {
                 fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
             }