DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 移除产品BOM相关模块和采购计划功能模块

Browse Source 
- 删除产品BOM（Bill of Materials）相关的控制器、服务、实体类及映射文件
- 移除了WmsProductBomController控制器及相关接口实现
- 清理了IWmsProductBomService服务接口与WmsProductBomServiceImpl实现类
- 移除了WmsProductBom实体类及其对应的BO/VO对象- 删除WmsProductBomMapper接口及XML配置文件
- 更新WmsMaterialCoilServiceImpl依赖注入，移除对IWmsProductBomService的引用
- 调整WmsCoilPendingActionMapper.xml路径从wms目录迁移至klp目录下
- 整理采购计划相关模块代码结构，确保模块清晰分离
This commit is contained in:
Joshi
2025-11-13 13:24:09 +08:00
parent 1bccfe57d8
commit 9c88669751
28 changed files with 65 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/resources/mapper/wms/WmsCoilPendingActionMapper.xml → klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsCoilPendingActionMapper">
<resultMap type="com.klp.domain.WmsCoilPendingAction" id="WmsCoilPendingActionResult">

37
klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml
View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsProductBomMapper">
<resultMap type="com.klp.domain.WmsProductBom" id="WmsProductBomResult">
<result property="bomId" column="bom_id"/>
<result property="productId" column="product_id"/>
<result property="rawMaterialId" column="raw_material_id"/>
<result property="quantity" column="quantity"/>
<result property="unit" column="unit"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="listByProductId" resultType="com.klp.domain.WmsProductBom">
SELECT bom_id, product_id, raw_material_id, quantity, unit, remark
FROM wms_product_bom
WHERE product_id = #{productId}
and del_flag = 0
</select>
<!-- 分页联查产品和原材料名称编码，支持Wrapper动态条件，返回Page<WmsProductBomVo> -->
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsProductBomVo">
SELECT
b.*,
p.product_name AS productName,
p.product_code AS productCode,
r.raw_material_name AS rawMaterialName,
r.raw_material_code AS rawMaterialCode
FROM wms_product_bom b
LEFT JOIN wms_product p ON b.product_id = p.product_id AND p.del_flag = 0
LEFT JOIN wms_raw_material r ON b.raw_material_id = r.raw_material_id AND r.del_flag = 0
${ew.customSqlSegment}
</select>
</mapper>

51
klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsPurchasePlanDetailMapper">
<resultMap type="com.klp.domain.WmsPurchasePlanDetail" id="WmsPurchasePlanDetailResult">
<result property="detailId" column="detail_id"/>
<result property="planId" column="plan_id"/>
<result property="rawMaterialId" column="raw_material_id"/>
<result property="owner" column="owner"/>
<result property="quantity" column="quantity"/>
<result property="unit" column="unit"/>
<result property="annex" column="annex"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="contractId" column="contract_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="detailCode" column="detail_code"/>
</resultMap>
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
<!-- 联查材料名称编码 -->
SELECT
wpd.*,
wm.raw_material_name AS rawMaterialName,
wm.raw_material_code AS rawMaterialCode,
ws.name AS supplierName,
wc.contract_no AS contractNo
FROM
wms_purchase_plan_detail wpd
LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id and wm.del_flag = 0
left join wms_supplier ws on wpd.supplier_id = ws.supplier_id and ws.del_flag = 0
left join wms_contract wc on wpd.contract_id = wc.contract_id and wc.del_flag = 0
${ew.customSqlSegment}
</select>
<select id="getByRawMaterialIdAndOnTheWay" resultType="java.math.BigDecimal">
select sum(wpd.quantity)
from wms_purchase_plan_detail wpd
where wpd.raw_material_id = #{rawMaterialId}
and wpd.status = 1
and wpd.del_flag = 0
</select>
</mapper>

23
klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanMapper.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsPurchasePlanMapper">
<resultMap type="com.klp.domain.WmsPurchasePlan" id="WmsPurchasePlanResult">
<result property="planId" column="plan_id"/>
<result property="planCode" column="plan_code"/>
<result property="owner" column="owner"/>
<result property="orderId" column="order_id"/>
<result property="status" column="status"/>
<result property="attachmentInfo" column="attachment_info"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>