feat(transfer): 添加调拨单审批功能和调拨类型字段
- 在WmsTransferOrder实体中添加调拨类型、审批人、审批时间和审批状态字段 - 在WmsMaterialCoil实体中添加调拨类型字段用于关联调拨信息 - 实现调拨单审批接口,支持通过或驳回操作 - 更新调拨单明细处理逻辑,确保调拨类型正确传递到钢卷信息 - 添加调拨单取消功能,可恢复调拨前的状态 - 在导出VO中增加调拨类型字段支持Excel导出 - 更新查询条件支持按调拨类型、审批状态等字段筛选 - 完善调拨流程中的数据验证和错误处理机制
This commit is contained in:
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="saleId" column="sale_id"/>
|
||||
<result property="saleName" column="sale_name"/>
|
||||
<result property="coilSurfaceTreatment" column="coil_surface_treatment"/>
|
||||
<result property="transferType" column="transfer_type"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
@@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.business_purpose,
|
||||
mc.is_related_to_order,
|
||||
mc.exclusive_status,
|
||||
mc.transfer_type,
|
||||
mc.sale_name AS saleName,
|
||||
su.nick_name AS saleNickName,
|
||||
w.warehouse_name AS warehouseName,
|
||||
@@ -222,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.business_purpose,
|
||||
mc.is_related_to_order,
|
||||
mc.exclusive_status,
|
||||
mc.transfer_type,
|
||||
mc.sale_name AS saleName,
|
||||
su.nick_name AS saleNickName,
|
||||
w.warehouse_name AS warehouseName,
|
||||
@@ -532,6 +535,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.packing_status AS packingStatus,
|
||||
-- 销售
|
||||
mc.sale_name AS saleName,
|
||||
-- 调拨类型
|
||||
mc.transfer_type AS transferType,
|
||||
-- 库存状态(中文显示)
|
||||
CASE
|
||||
WHEN mc.status = 0 THEN '在库'
|
||||
@@ -618,6 +623,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
mc.quality_status AS qualityStatus,
|
||||
mc.packing_status AS packingStatus,
|
||||
mc.sale_name AS saleName,
|
||||
mc.transfer_type AS transferType,
|
||||
CASE
|
||||
WHEN mc.status = 0 THEN '在库'
|
||||
WHEN mc.status = 1 THEN '已发货'
|
||||
|
||||
Reference in New Issue
Block a user