refactor(wms): 移除销售人员相关字段
- 从WmsMaterialCoilExportVo中移除saleName私有字段 - 从WmsMaterialCoilVo中移除saleId和saleName私有字段 - 从WmsMaterialCoilMapper.xml的多个查询中移除sale_name映射 - 从WmsMaterialCoilMapper.xml的关联查询中移除sys_user表连接 - 移除与销售人员相关的数据库字段映射和关联关系
This commit is contained in:
@@ -198,10 +198,10 @@ public class WmsMaterialCoilExportVo {
|
|||||||
@ExcelProperty(value = "操作完成时间")
|
@ExcelProperty(value = "操作完成时间")
|
||||||
private Date actionCompleteTime;
|
private Date actionCompleteTime;
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 销售人员
|
// * 销售人员
|
||||||
*/
|
// */
|
||||||
private String saleName;
|
// private String saleName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调拨类型
|
* 调拨类型
|
||||||
|
|||||||
@@ -230,10 +230,10 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
|||||||
private String createByName;
|
private String createByName;
|
||||||
private String updateByName;
|
private String updateByName;
|
||||||
|
|
||||||
//销售id
|
// //销售id
|
||||||
private Long saleId;
|
// private Long saleId;
|
||||||
// 销售昵称
|
// // 销售昵称
|
||||||
private String saleName;
|
// private String saleName;
|
||||||
|
|
||||||
//新增长度字段
|
//新增长度字段
|
||||||
private Long length;
|
private Long length;
|
||||||
|
|||||||
@@ -772,21 +772,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 新增查询逻辑也就是当saleId未空时候
|
// // 新增查询逻辑也就是当saleId未空时候
|
||||||
if (bo.getSaleId() != null) {
|
// if (bo.getSaleId() != null) {
|
||||||
if (bo.getSaleId() == -1) {
|
// if (bo.getSaleId() == -1) {
|
||||||
// 当saleId为-1时查询sale_id为空的记录
|
// // 当saleId为-1时查询sale_id为空的记录
|
||||||
qw.isNull("mc.sale_id");
|
// qw.isNull("mc.sale_id");
|
||||||
} else if (bo.getSaleId() > 0) {
|
// } else if (bo.getSaleId() > 0) {
|
||||||
// 正常传值时依据saleId作为查询条件
|
// // 正常传值时依据saleId作为查询条件
|
||||||
qw.eq("mc.sale_id", bo.getSaleId());
|
// qw.eq("mc.sale_id", bo.getSaleId());
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 销售人员姓名模糊查询
|
// // 销售人员姓名模糊查询
|
||||||
if (bo.getSaleName() != null && !bo.getSaleName().isEmpty()) {
|
// if (bo.getSaleName() != null && !bo.getSaleName().isEmpty()) {
|
||||||
qw.like("su.nick_name", bo.getSaleName());
|
// qw.like("su.nick_name", bo.getSaleName());
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 仅查询废品:质量状态为 D+、D、D-
|
// 仅查询废品:质量状态为 D+、D、D-
|
||||||
if (Boolean.TRUE.equals(bo.getOnlyScrap())) {
|
if (Boolean.TRUE.equals(bo.getOnlyScrap())) {
|
||||||
@@ -1743,12 +1743,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
// 使用MyBatis-Plus的updateById方法直接更新
|
// 使用MyBatis-Plus的updateById方法直接更新
|
||||||
boolean flag = baseMapper.updateById(updateCoil) > 0;
|
boolean flag = baseMapper.updateById(updateCoil) > 0;
|
||||||
// 特殊处理saleId字段,确保null值也能被正确更新
|
// 特殊处理saleId字段,确保null值也能被正确更新
|
||||||
if (bo.getSaleId() == null) {
|
// if (bo.getSaleId() == null) {
|
||||||
LambdaUpdateWrapper<WmsMaterialCoil> updateWrapper = new LambdaUpdateWrapper<>();
|
// LambdaUpdateWrapper<WmsMaterialCoil> updateWrapper = new LambdaUpdateWrapper<>();
|
||||||
updateWrapper.eq(WmsMaterialCoil::getCoilId, bo.getCoilId());
|
// updateWrapper.eq(WmsMaterialCoil::getCoilId, bo.getCoilId());
|
||||||
updateWrapper.set(WmsMaterialCoil::getSaleId, (Long)null);
|
// updateWrapper.set(WmsMaterialCoil::getSaleId, (Long)null);
|
||||||
baseMapper.update(null, updateWrapper);
|
// baseMapper.update(null, updateWrapper);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 检查长度/厚度偏差并插入告警
|
// 检查长度/厚度偏差并插入告警
|
||||||
materialWarningService.checkAndInsertWarnings(updateCoil, bo);
|
materialWarningService.checkAndInsertWarnings(updateCoil, bo);
|
||||||
|
|||||||
@@ -116,7 +116,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.trimming_requirement,
|
mc.trimming_requirement,
|
||||||
mc.packaging_requirement,
|
mc.packaging_requirement,
|
||||||
mc.packing_status,
|
mc.packing_status,
|
||||||
mc.sale_id AS saleId,
|
|
||||||
mc.length,
|
mc.length,
|
||||||
mc.actual_length,
|
mc.actual_length,
|
||||||
mc.actual_width,
|
mc.actual_width,
|
||||||
@@ -136,7 +135,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.schedule_thickness,
|
mc.schedule_thickness,
|
||||||
mc.theoretical_length,
|
mc.theoretical_length,
|
||||||
mc.chrome_plate_coil_no,
|
mc.chrome_plate_coil_no,
|
||||||
mc.sale_name AS saleName,
|
|
||||||
w.warehouse_name AS warehouseName,
|
w.warehouse_name AS warehouseName,
|
||||||
nw.warehouse_name AS nextWarehouseName,
|
nw.warehouse_name AS nextWarehouseName,
|
||||||
aw.actual_warehouse_name AS actualWarehouseName,
|
aw.actual_warehouse_name AS actualWarehouseName,
|
||||||
@@ -485,7 +483,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
-- 打包状态(直接展示原始值)
|
-- 打包状态(直接展示原始值)
|
||||||
mc.packing_status AS packingStatus,
|
mc.packing_status AS packingStatus,
|
||||||
-- 销售
|
-- 销售
|
||||||
mc.sale_name AS saleName,
|
|
||||||
-- 调拨类型
|
-- 调拨类型
|
||||||
mc.transfer_type AS transferType,
|
mc.transfer_type AS transferType,
|
||||||
-- 理论厚度
|
-- 理论厚度
|
||||||
@@ -581,7 +578,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.packaging_requirement AS packagingRequirement,
|
mc.packaging_requirement AS packagingRequirement,
|
||||||
mc.quality_status AS qualityStatus,
|
mc.quality_status AS qualityStatus,
|
||||||
mc.packing_status AS packingStatus,
|
mc.packing_status AS packingStatus,
|
||||||
mc.sale_name AS saleName,
|
|
||||||
mc.transfer_type AS transferType,
|
mc.transfer_type AS transferType,
|
||||||
mc.theoretical_thickness AS theoreticalThickness,
|
mc.theoretical_thickness AS theoreticalThickness,
|
||||||
mc.schedule_thickness AS scheduleThickness,
|
mc.schedule_thickness AS scheduleThickness,
|
||||||
@@ -703,7 +699,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.packaging_requirement AS packagingRequirement,
|
mc.packaging_requirement AS packagingRequirement,
|
||||||
mc.quality_status AS qualityStatus,
|
mc.quality_status AS qualityStatus,
|
||||||
mc.packing_status AS packingStatus,
|
mc.packing_status AS packingStatus,
|
||||||
mc.sale_name AS saleName,
|
|
||||||
mc.transfer_type AS transferType,
|
mc.transfer_type AS transferType,
|
||||||
mc.theoretical_thickness AS theoreticalThickness,
|
mc.theoretical_thickness AS theoreticalThickness,
|
||||||
mc.schedule_thickness AS scheduleThickness,
|
mc.schedule_thickness AS scheduleThickness,
|
||||||
@@ -978,7 +973,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
|
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
|
||||||
LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
|
LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
|
||||||
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
|
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
|
||||||
LEFT JOIN sys_user su ON mc.sale_id = su.user_id
|
|
||||||
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
|
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
|
||||||
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
|
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
|
|||||||
Reference in New Issue
Block a user