审批通过时修改申领记录表状态、添加出库记录表、添加物料日志表记录、修改库存数量

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmBorrowApplicationDao.xml

@@ -12,7 +12,7 @@
             <if test="params.params.application_no != null and params.params.application_no != ''">
                 AND application_no LIKE CONCAT('%', #{params.params.application_no}, '%')
             </if>
-            <if test="params.params.approval_status != null and params.params.approval_status != ''">
+            <if test="params.params.approval_status != null">
                 AND approval_status = #{params.params.approval_status}
             </if>
         </where>
@@ -74,7 +74,7 @@
     </update>
 
     <update id="approve" parameterType="map">
-        UPDATE jl_key_dm_borrow_application SET approval_status = 9, approval_time = NOW(), issue_status = 1, update_by = #{_user.id}, update_time = NOW() WHERE id = #{id}
+        UPDATE jl_key_dm_borrow_application SET approval_status = 9, approval_time = NOW(), issue_time = NOW(), issue_status = 1, update_by = #{_user.id}, update_time = NOW() WHERE id = #{id}
     </update>
 
     <update id="reject" parameterType="map">
@@ -94,16 +94,37 @@
         FROM jl_key_dm_borrow_application WHERE id = #{id}
     </insert>
 
+    <select id="selectInventoryByMaterialId" parameterType="map" resultType="map">
+        select i.*,m.can_borrow
+        from jl_key_dm_inventory as i
+        left join jl_key_dm_material as m
+        on m.id = i.material_id
+        where material_id = #{material_id}
+
+    </select>
+
+    <!-- 更新库存：根据申请明细扣减可用库存（mapper 内部实现以事务执行） -->
+    <update id="updateInventoryTotalQuantity" parameterType="map">
+        <!-- 简化：调用存储过程或在 mapper 中实现逐条更新 -->
+        <!-- 实际实现依赖于业务，留给 mapper/服务调用具体 SQL -->
+        update jl_key_dm_inventory
+        set total_quantity = total_quantity - #{apply_quantity}
+        where material_id = #{material_id}
+    </update>
+
     <!-- 更新库存：根据申请明细扣减可用库存（mapper 内部实现以事务执行） -->
-    <update id="updateInventoryByApplication" parameterType="map">
+    <update id="updateInventoryBorrowedQuantity" parameterType="map">
         <!-- 简化：调用存储过程或在 mapper 中实现逐条更新 -->
         <!-- 实际实现依赖于业务，留给 mapper/服务调用具体 SQL -->
-        update jl_key_dm_inventory set
+        update jl_key_dm_inventory
+        set borrowed_quantity = borrowed_quantity + #{apply_quantity}
+        where material_id = #{material_id}
     </update>
 
     <!-- 插入日志 -->
     <insert id="insertMaterialLogByApplication" parameterType="map">
         <!-- 简化：实现者可在业务层调用单条插入，此处为占位 -->
+        insert into jl_key_dm_material_log()
     </insert>
     <select id="selectLogsByApplicationId" parameterType="map">
 

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmBorrowDetailDao.xml

@@ -11,7 +11,11 @@
     </insert>
 
     <select id="selectDetailsByApplicationId" parameterType="map" resultType="map">
-        SELECT * FROM jl_key_dm_borrow_application_detail WHERE application_id = #{id} AND is_used = 1 ORDER BY create_time ASC
+        SELECT bd.*,m.category_id
+        FROM jl_key_dm_borrow_application_detail as bd
+        left join jl_key_dm_material as m
+        on m.id = bd.material_id
+        WHERE bd.application_id = #{id} AND bd.is_used = 1 ORDER BY bd.create_time ASC
     </select>
 
 </mapper>

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmInboundRecordDao.xml

@@ -111,7 +111,11 @@
     </insert>
 
     <select id="selectLogsByInboundId" parameterType="map" resultType="map">
-        SELECT * FROM jl_key_dm_material_log WHERE relation_id = #{id} AND is_used = 1 ORDER BY create_time ASC
+        SELECT ml.*,m.material_name
+        FROM jl_key_dm_material_log as ml
+        left join jl_key_dm_material as m
+        on m.id = ml.material_id
+        WHERE ml.relation_id = #{id} AND ml.is_used = 1 ORDER BY ml.create_time ASC
     </select>
 
 </mapper>

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmMaterialLogDao.xml

@@ -8,13 +8,18 @@
         ) VALUES
         <foreach collection="details" item="item" separator=",">
         (
-            UUID(),#{item.category_id},#{item.id},1,#{item.inbound_id},#{item.id},#{item.inbound_quantity},#{item.unit_price},#{item.total_amount},1,#{_user.id},NOW()
+            UUID(),#{item.category_id},#{item.material_id},#{op_type},#{id},#{item.material_id},#{item.apply_quantity},#{item.unit_price},#{item.total_amount},1,#{create_by},NOW()
         )
         </foreach>
     </insert>
 
     <select id="selectLogsByApplicationId" parameterType="map" resultType="map">
-        SELECT * FROM jl_key_dm_material_log WHERE relation_id = #{id} AND is_used = 1 ORDER BY create_time ASC
+        SELECT ml.*,m.material_name
+        FROM jl_key_dm_material_log as ml
+        left join jl_key_dm_material as m
+        on ml.material_id = m.id
+        WHERE relation_id = #{id}
+        AND ml.is_used = 1 ORDER BY ml.create_time ASC
     </select>
 
 </mapper>