From 4f38e5827b848298de8e95f59e0ba9b24951e615 Mon Sep 17 00:00:00 2001 From: lixiangyu <lixiangyu@xalxzn.com> Date: 星期二, 16 九月 2025 18:01:18 +0800 Subject: [PATCH] refactor(cms): 优化刀具管理功能和性能 刀具报废功能 - 新增 提交（/subumit）接口 刀具报废功能 - 修改完善其删除功能，同时删除报废单和报废明细 刀具报废功能 - （/add）接口中增加逻辑判断禁制同一个刀具重复申请报废 刀具领用功能 - 完善刀具寿命计算 刀具领用功能 - 完善其删除功能，同时删除领用单和领用明细 刀具入库功能 - 完善其删除功能，同时删除入库单和入库明细 把刀具库存中的库存状态，从“正常”改为“在库”。 --- src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveMapper.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveMapper.xml index cfc1730..4352701 100644 --- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveMapper.xml +++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveMapper.xml @@ -2,4 +2,21 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.cms.mapper.CuttingReceiveMapper"> + <select id="getInventoryToolList" parameterType="Map" resultType="Map"> + SELECT + t1.cutting_id cuttingId, + t1.id, + t1.cutting_barcode cuttingBarcode, + t1.current_life currentLife, + t2.cutting_code cuttingCode, + t2.cutting_name cuttingName, + t2.cutting_category, + t3.item_text cuttingCategory + FROM cms_cutting_inventory t1 + LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id + LEFT JOIN (select * from v_sys_dict where dict_code = 'cutting_category') t3 on t3.item_value = t2.cutting_category + WHERE t1.inventory_status = '鍦ㄥ簱' + AND t2.del_flag = 0 + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3