物资更改

ruoyi-psa/src/main/java/com/ruoyi/material/controller/PsaMaterialController.java

@@ -132,7 +132,6 @@ public class PsaMaterialController extends BaseController
     /**
      * 查询所有物品类别
      */
-    @PreAuthorize("@ss.hasPermi('psa:material:list')")
     @GetMapping("/type/list")
     public AjaxResult materialType()
     {
@@ -142,7 +141,6 @@ public class PsaMaterialController extends BaseController
     /**
      * 查询所有类别的细分物品
      */
-    @PreAuthorize("@ss.hasPermi('psa:material:list')")
     @GetMapping("/type/detail/list")
     public AjaxResult materialTypeDetail()
     {

ruoyi-psa/src/main/java/com/ruoyi/materialapply/controller/PsaMaterialApplyController.java

@@ -116,7 +116,6 @@ public class PsaMaterialApplyController extends BaseController
     /**
      * 查项目和用户中间表
      */
-    @PreAuthorize("@ss.hasPermi('material:apply:select')")
     @GetMapping("/selectuser")
     public AjaxResult select()
     {

ruoyi-psa/src/main/java/com/ruoyi/materialentry/controller/PsaMaterialEntryController.java

@@ -50,7 +50,7 @@ public class PsaMaterialEntryController extends BaseController
     }
 
     /**
-     * 查询物品入库信息列表
+     * 查询物品草稿箱列表
      */
     @PreAuthorize("@ss.hasPermi('psa:entry:draft')")
     @GetMapping("/list/draft")

ruoyi-psa/src/main/java/com/ruoyi/materialentry/domain/PsaMaterialEntry.java

@@ -31,6 +31,9 @@ public class PsaMaterialEntry extends BaseEntity
     @Excel(name = "报销ID",defaultValue = "无")
     private Long expenseId;
 
+    /** 流水号 */
+    private String serialNumber;
+
     /** 物类ID */
 
     private Long typeId;

ruoyi-psa/src/main/resources/mapper/material/PsaMaterialEntryMapper.xml

@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="draft"    column="draft"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="typeName" column="type_name" />
+        <result property="serialNumber" column="serial_number" />
+
     </resultMap>
 
     <sql id="selectPsaMaterialEntryVo">
@@ -39,23 +41,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                pe.remark,
                pe.draft,
                pe.del_flag,
-               pmt.type_name
+               pmt.type_name,
+               fpcr.serial_number
         from psa_material_entry pe
         left join psa_material_type pmt on pe.type_id = pmt.id
+        left join fygl_project_cost_reimbursement fpcr on pe.expense_id = fpcr.id
     </sql>
 
     <select id="selectPsaMaterialEntryList" parameterType="PsaMaterialEntry" resultMap="PsaMaterialEntryResult">
         <include refid="selectPsaMaterialEntryVo"/>
         <where>  
-            <if test="entryMethod != null  and entryMethod != ''"> and entry_method = #{entryMethod}</if>
-            <if test="materialId != null "> and material_id = #{materialId}</if>
-            <if test="expenseId != null "> and expense_id = #{expenseId}</if>
-            <if test="typeId != null "> and type_id = #{typeId}</if>
-            <if test="itemId != null "> and item_id = #{itemId}</if>
-            <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
-            <if test="entryQuantity != null "> and entry_quantity = #{entryQuantity}</if>
-            <if test="draft != null  and draft != ''"> and draft = #{draft}</if>
-            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+            <if test="entryMethod != null  and entryMethod != ''"> and pe.entry_method = #{entryMethod}</if>
+            <if test="materialId != null "> and pe.material_id = #{materialId}</if>
+            <if test="expenseId != null "> and pe.expense_id = #{expenseId}</if>
+            <if test="typeId != null "> and pe.type_id = #{typeId}</if>
+            <if test="itemId != null "> and pe.item_id = #{itemId}</if>
+            <if test="itemName != null  and itemName != ''"> and pe.item_name like concat('%', #{itemName}, '%')</if>
+            <if test="entryQuantity != null "> and pe.entry_quantity = #{entryQuantity}</if>
+            <if test="draft != null  and draft != ''"> and pe.draft = #{draft}</if>
+            <if test="delFlag != null  and delFlag != ''"> and pe.del_flag = #{delFlag}</if>
         </where>
     </select>