盘点内容以及单据号规则

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -605,10 +605,34 @@
 
     <select id="getByWarehouseAndScene" resultMap="RkInfoResult">
         SELECT
-        ri.*
+            ri.*,
+            CASE
+                WHEN pd.scene = 'HJ' THEN '货架'
+                WHEN pd.scene = 'DC' THEN '堆场'
+                ELSE pd.scene
+                END AS sceneName,
+            sit.type_name AS operationTypeName,
+            /* ===== 新增：计算总金额 ===== */
+            ri.real_qty * ri.ht_dj AS total_amount,
+
+            COALESCE(sit.type_name, sot.type_name) AS operation_type_name,
+            mt.type_name AS wl_type_name,
+
+            wh.warehouse_name,
+            wh.parent_warehouse_code,
+            wh.parent_warehouse_name,
+
+            su.nick_name AS operator_name,
+
+            DATEDIFF(CURRENT_DATE, ri.operation_time) AS stock_age
+
         FROM rk_info ri
-        JOIN pcde_detail pd
-        ON pd.pcode = ri.pcode
+                 LEFT JOIN stock_in_type  sit ON ri.operation_type = sit.type_code
+                 LEFT JOIN stock_out_type sot ON ri.operation_type = sot.type_code
+                 LEFT JOIN material_type  mt  ON ri.wl_type        = mt.type_code
+                 LEFT JOIN warehouse_info wh  ON ri.cangku         = wh.warehouse_code
+                 LEFT JOIN sys_user       su  ON ri.operator       = su.user_id
+                 LEFT JOIN pcde_detail    pd  ON pd.pcode          = ri.pcode
         WHERE ri.exec_status = 1
         AND ri.is_delete = '0'
         AND ri.is_chuku = '0'
@@ -630,5 +654,9 @@
 
     </select>
 
-
+    <select id="selectTodayMaxBillNo" resultType="java.lang.String">
+        SELECT MAX(bill_no)
+        FROM rk_info
+        WHERE bill_no LIKE CONCAT(#{prefix}, #{date}, '%')
+    </select>
 </mapper>