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

feat(wms):修改insertByBo方法返回类型为WmsMaterialCoilVo

Browse Source
This commit is contained in:
Joshi
2025-11-17 10:47:36 +08:00
parent acd4202d26
commit 0ccbb7ddb6
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
View File

@@ -72,8 +72,8 @@ public class WmsMaterialCoilController extends BaseController {
@Log(title = "钢卷物料表", businessType = BusinessType.INSERT) @Log(title = "钢卷物料表", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsMaterialCoilBo bo) { public R<WmsMaterialCoilVo> add(@Validated(AddGroup.class) @RequestBody WmsMaterialCoilBo bo) {
return toAjax(iWmsMaterialCoilService.insertByBo(bo)); return R.ok(iWmsMaterialCoilService.insertByBo(bo));
} }
/** /**

2
klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java
View File

@@ -35,7 +35,7 @@ public interface IWmsMaterialCoilService {
/** /**
* 新增钢卷物料表 * 新增钢卷物料表
*/ */
Boolean insertByBo(WmsMaterialCoilBo bo); WmsMaterialCoilVo insertByBo(WmsMaterialCoilBo bo);
/** /**
* 修改钢卷物料表 * 修改钢卷物料表

23
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -149,12 +149,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
public TableDataInfo<WmsMaterialCoilVo> queryPageList(WmsMaterialCoilBo bo, PageQuery pageQuery) { public TableDataInfo<WmsMaterialCoilVo> queryPageList(WmsMaterialCoilBo bo, PageQuery pageQuery) {
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo); QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
// 填充每个记录的产品或原材料对象 // 填充每个记录的产品或原材料对象
for (WmsMaterialCoilVo vo : result.getRecords()) { for (WmsMaterialCoilVo vo : result.getRecords()) {
fillItemObject(vo); fillItemObject(vo);
} }
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@@ -210,15 +210,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
public List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo) { public List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo); QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
List<WmsMaterialCoilVo> list = baseMapper.selectVoListWithDynamicJoin(lqw); List<WmsMaterialCoilVo> list = baseMapper.selectVoListWithDynamicJoin(lqw);
// 填充每个记录的产品或原材料对象 // 填充每个记录的产品或原材料对象
for (WmsMaterialCoilVo vo : list) { for (WmsMaterialCoilVo vo : list) {
fillItemObject(vo); fillItemObject(vo);
} }
return list; return list;
} }
/** /**
* 填充物品对象（产品或原材料） * 填充物品对象（产品或原材料）
*/ */
@@ -226,12 +226,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
if (vo.getItemId() == null || vo.getItemType() == null) { if (vo.getItemId() == null || vo.getItemType() == null) {
return; return;
} }
// 查询原材料信息 // 查询原材料信息
if ("raw_material".equals(vo.getItemType())) { if ("raw_material".equals(vo.getItemType())) {
WmsRawMaterialVo rawMaterial = rawMaterialService.queryById(vo.getItemId()); WmsRawMaterialVo rawMaterial = rawMaterialService.queryById(vo.getItemId());
vo.setRawMaterial(rawMaterial); vo.setRawMaterial(rawMaterial);
// 查询原材料对应的BOM信息 // 查询原材料对应的BOM信息
if (rawMaterial != null && rawMaterial.getBomId() != null) { if (rawMaterial != null && rawMaterial.getBomId() != null) {
WmsBomItemBo bomItemBo = new WmsBomItemBo(); WmsBomItemBo bomItemBo = new WmsBomItemBo();
@@ -240,12 +240,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
vo.setBomItemList(bomItemList); vo.setBomItemList(bomItemList);
} }
} }
// 查询产品信息 // 查询产品信息
if ("product".equals(vo.getItemType())) { if ("product".equals(vo.getItemType())) {
WmsProductVo product = productService.queryById(vo.getItemId()); WmsProductVo product = productService.queryById(vo.getItemId());
vo.setProduct(product); vo.setProduct(product);
// 查询产品对应的BOM信息 // 查询产品对应的BOM信息
if (product != null && product.getBomId() != null) { if (product != null && product.getBomId() != null) {
WmsBomItemBo bomItemBo = new WmsBomItemBo(); WmsBomItemBo bomItemBo = new WmsBomItemBo();
@@ -261,7 +261,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(WmsMaterialCoilBo bo) { public WmsMaterialCoilVo insertByBo(WmsMaterialCoilBo bo) {
// 1. 生成二维码 // 1. 生成二维码
Long qrcodeRecordId = generateQrcodeForInsert(bo); Long qrcodeRecordId = generateQrcodeForInsert(bo);
bo.setQrcodeRecordId(qrcodeRecordId); bo.setQrcodeRecordId(qrcodeRecordId);
@@ -280,7 +280,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 4. 更新二维码内容中的coilId // 4. 更新二维码内容中的coilId
updateQrcodeCoilId(qrcodeRecordId, add.getCoilId()); updateQrcodeCoilId(qrcodeRecordId, add.getCoilId());
} }
return flag; // 4. 返回完整的 VO（包含关联对象）
return queryById(add.getCoilId());
} }
/** /**