wenshijun/smart_management_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成单据号逻辑修改

Browse Source 
线程池线程数修改
This commit is contained in:
wenshijun
2026-01-14 08:14:04 +08:00
parent 5d227b7b6b
commit 1a565dba0d
10 changed files with 212 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/main/resources/mybatis/wisdom/RkInfoMapper.xml
View File

@@ -67,6 +67,10 @@
<result property="fycde1" column="fycde_1"/>
<result property="fycde2" column="fycde_2"/>
<result property="isDelivery" column="is_delivery"/>
<!-- ✅ 库龄（天） -->
<result property="stockAge" column="stock_age"/>
<!-- 总金额 -->
<result property="totalAmount" column="total_amount"/>
</resultMap>
<!-- 明细查询SQL（包含多表JOIN，用于普通明细分页等） -->
@@ -79,37 +83,85 @@
ri.wl_type, mt.type_name AS wl_type_name,
ri.cangku,
wh.warehouse_name AS cangku_name,
wh.warehouse_name AS cangku_name,
-- 新增：大仓/小仓编码和名称
wh.parent_warehouse_code AS parent_warehouse_code,
wh.parent_warehouse_name AS parent_warehouse_name,
wh.warehouse_code AS warehouse_code,
wh.warehouse_name AS warehouse_name,
wh.parent_warehouse_code AS parent_warehouse_code,
wh.parent_warehouse_name AS parent_warehouse_name,
wh.warehouse_code AS warehouse_code,
wh.warehouse_name AS warehouse_name,
ri.rk_time,
ri.lihuo_y,
ri.is_chuku,
ri.is_borrowed,
ri.is_delivery,
ri.remark,
ri.ck_lihuo_y,
ri.ck_type,
sot.type_name AS ck_type_name,
ri.team_code,
ct.team_name,
ri.rk_time, ri.lihuo_y, ri.is_chuku, ri.is_borrowed, ri.is_delivery,ri.remark,
ri.ck_lihuo_y, ri.ck_type, sot.type_name AS ck_type_name,
ri.team_code, ct.team_name,
ri.ck_remark,
ri.ly_time,
ri.fycde_1, ri.fycde_2,
ri.borrow_time, ri.return_time,
ri.xj, ri.xm_no, ri.xm_ms, ri.wl_no, ri.wl_ms, ri.xm_no_ck, ri.xm_ms_ck,
ri.gys_no, ri.gys_mc, ri.jh_amt, ri.ht_dj, ri.sap_no, ri.xh, ri.gys_jh_id,
ri.jh_qty, ri.ht_qty, ri.dw, ri.real_qty,
ri.pcode, ri.pcode_id, ri.tray_code, ri.entity_id,
ri.status, ri.has_moved,
ri.create_by, ri.create_time, ri.update_by, ri.update_time, ri.is_delete,
u.user_name AS lihuo_y_name
ri.borrow_time,
ri.return_time,
ri.xj,
ri.xm_no,
ri.xm_ms,
ri.xm_no_ck,
ri.xm_ms_ck,
ri.wl_no,
ri.wl_ms,
ri.gys_no,
ri.gys_mc,
ri.jh_amt,
ri.ht_dj,
ri.sap_no,
ri.xh,
ri.gys_jh_id,
ri.jh_qty,
ri.ht_qty,
ri.dw,
ri.real_qty,
ri.pcode,
ri.pcode_id,
ri.tray_code,
ri.entity_id,
ri.status,
ri.has_moved,
ri.create_by,
ri.create_time,
ri.update_by,
ri.update_time,
ri.is_delete,
u.user_name AS lihuo_y_name,
-- ✅ 库龄（天）
DATEDIFF(CURDATE(), ri.rk_time) AS stock_age,
-- 总金额 = 单价 × 实际数量
COALESCE(ri.ht_dj, 0) * COALESCE(ri.real_qty, 0) AS total_amount
FROM rk_info ri
LEFT JOIN stock_in_type st ON ri.rk_type = st.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 stock_out_type sot ON ri.ck_type = sot.type_code
LEFT JOIN stock_in_type st ON ri.rk_type = st.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 stock_out_type sot ON ri.ck_type = sot.type_code
LEFT JOIN construction_team ct ON ri.team_code = ct.team_code
LEFT JOIN sys_user u ON ri.lihuo_y = u.user_id
LEFT JOIN sys_user u ON ri.lihuo_y = u.user_id
</sql>
<!-- 轻量分组专用SQL：仅rk_info字段，不做JOIN（供按单据分组内层使用） -->
<sql id="selectRkInfoForGroup">
SELECT