日志添加区域code

归还按照区域库存归还

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmInboundServiceImpl.java

@@ -285,13 +285,7 @@ public class KeyDmInboundServiceImpl {
             detail.put("application_id", applicationId);
             detail.put("op_type", OP_TYPE_RETURN);
             detail.put("_user", returnData.get("_user"));
-
-            // 设置应用机构代码
-            Map<String, Object> user = (Map<String, Object>) detail.get("_user");
-            if (user != null) {
-                Map<String, String> pos = DataScopeUtil.getPosition(user);
-                detail.put("apply_dep_code", pos.get("area_id"));
-            }
+            detail.put("areaId", returnData.get("apply_dep_code"));
 
             // 更新申领明细归还数量
             commonService.insert(namespace + "updateBorrowDetailReturnedQuantity", detail);

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

@@ -99,10 +99,12 @@
         update jl_key_dm_inventory
         set borrowed_quantity = borrowed_quantity - #{apply_quantity}
         ,damaged_quantity = damaged_quantity + #{damaged_quantity}
-        where material_id = #{material_id}
-        <if test="apply_dep_code != null and apply_dep_code != ''">
-            AND apply_dep_code = #{apply_dep_code}
+        <where>
+            material_id = #{material_id}
+            <if test="areaId != null">
+                AND apply_dep_code = #{areaId}
             </if>
+        </where>
     </update>
 
     <!-- update inventory by inbound (placeholder) -->

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

@@ -14,21 +14,21 @@
     </insert>
     <insert id="insertLogByInbound" parameterType="map">
         INSERT INTO jl_key_dm_material_log(
-        id,category_id,material_id,op_type,relation_id,relation_item_id,quantity,unit_price,total_amount,is_used,create_by,create_time
+        id,category_id,material_id,op_type,relation_id,relation_item_id,quantity,unit_price,total_amount,is_used,create_by,create_time,apply_dep_code
         ) VALUES
         <foreach collection="details" item="item" separator=",">
             (
-            UUID(),#{item.category_id},#{item.material_id},#{inbound_type},#{id},#{item.material_id},#{item.inbound_quantity},#{item.unit_price},#{item.total_amount},1,#{create_by},NOW()
+            UUID(),#{item.category_id},#{item.material_id},#{inbound_type},#{id},#{item.material_id},#{item.inbound_quantity},#{item.unit_price},#{item.total_amount},1,#{create_by},NOW(),#{_user.areaId}
             )
         </foreach>
     </insert>
     <insert id="insertLogByReturn" parameterType="map">
         INSERT INTO jl_key_dm_material_log(
-        id,category_id,material_id,op_type,relation_id,relation_item_id,quantity,unit_price,total_amount,is_used,create_by,create_time
+        id,category_id,material_id,op_type,relation_id,relation_item_id,quantity,unit_price,total_amount,is_used,create_by,create_time,apply_dep_code
         ) VALUES
         <foreach collection="details" item="item" separator=",">
             (
-            UUID(),#{item.category_id},#{item.material_id},#{inbound_type},#{inbound_id},#{item.material_id},#{item.apply_quantity},#{item.unit_price},#{item.total_amount},1,#{create_by},NOW()
+            UUID(),#{item.category_id},#{item.material_id},#{inbound_type},#{inbound_id},#{item.material_id},#{item.apply_quantity},#{item.unit_price},#{item.total_amount},1,#{create_by},NOW(),#{apply_dep_code}
             )
         </foreach>
     </insert>