feat(wms): 采购计划单新增供应商和合同信息
- 在 WmsPurchasePlanDetail 和 WmsPurchasePlanDetailBo 中添加供应商 ID 和合同 ID 字段 - 更新 WmsPurchasePlanDetailMapper 和 XML 映射文件以支持新字段 - 在 WmsPurchasePlanDetailVo 中添加供应商名称和合同编号字段
This commit is contained in:
@@ -63,4 +63,14 @@ public class WmsPurchasePlanDetail extends BaseEntity {
|
|||||||
@TableLogic
|
@TableLogic
|
||||||
private Integer delFlag;
|
private Integer delFlag;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 供应商ID
|
||||||
|
*/
|
||||||
|
private Long supplierId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同ID
|
||||||
|
*/
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,5 +65,15 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 供应商ID
|
||||||
|
*/
|
||||||
|
private Long supplierId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同ID
|
||||||
|
*/
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,4 +91,24 @@ public class WmsPurchasePlanDetailVo {
|
|||||||
* 在途量
|
* 在途量
|
||||||
*/
|
*/
|
||||||
private BigDecimal onTheWay;
|
private BigDecimal onTheWay;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 供应商ID
|
||||||
|
*/
|
||||||
|
private Long supplierId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同ID
|
||||||
|
*/
|
||||||
|
private Long contractId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 供应商名称
|
||||||
|
*/
|
||||||
|
private String supplierName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合同编号
|
||||||
|
*/
|
||||||
|
private String contractNo;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.klp.mapper;
|
package com.klp.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.klp.domain.WmsPurchasePlanDetail;
|
import com.klp.domain.WmsPurchasePlanDetail;
|
||||||
import com.klp.domain.vo.WmsPurchasePlanDetailVo;
|
import com.klp.domain.vo.WmsPurchasePlanDetailVo;
|
||||||
|
|||||||
@@ -19,16 +19,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="updateTime" column="update_time"/>
|
<result property="updateTime" column="update_time"/>
|
||||||
<result property="updateBy" column="update_by"/>
|
<result property="updateBy" column="update_by"/>
|
||||||
|
<result property="contractId" column="contract_id"/>
|
||||||
|
<result property="supplierId" column="supplier_id"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
|
<select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsPurchasePlanDetailVo">
|
||||||
<!-- 联查材料名称编码 -->
|
<!-- 联查材料名称编码 -->
|
||||||
SELECT
|
SELECT
|
||||||
wpd.*,
|
wpd.*,
|
||||||
wm.raw_material_name AS rawMaterialName,
|
wm.raw_material_name AS rawMaterialName,
|
||||||
wm.raw_material_code AS rawMaterialCode
|
wm.raw_material_code AS rawMaterialCode,
|
||||||
|
ws.name AS supplierName,
|
||||||
|
wc.contract_no AS contractNo
|
||||||
FROM
|
FROM
|
||||||
wms_purchase_plan_detail wpd
|
wms_purchase_plan_detail wpd
|
||||||
LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id
|
LEFT JOIN wms_raw_material wm ON wpd.raw_material_id = wm.raw_material_id
|
||||||
|
left join wms_supplier ws on wpd.supplier_id = ws.supplier_id
|
||||||
|
left join wms_contract wc on wpd.contract_id = wc.contract_id
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user