Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

This commit is contained in:
砂糖
2025-11-17 11:44:35 +08:00

View File

@@ -269,17 +269,19 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 2. 查找或创建stock // 2. 查找或创建stock
findOrCreateStock(bo); findOrCreateStock(bo);
// 3. 插入钢卷数据 // 3. 插入钢卷数据
WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
add.setDataType(1); // 新增的钢卷默认为当前数据 add.setDataType(1); // 新增的钢卷默认为当前数据
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; int rows = baseMapper.insert(add);
if (flag) { if (rows <= 0) {
bo.setCoilId(add.getCoilId()); throw new RuntimeException("新增钢卷失败");
// 4. 更新二维码内容中的coilId
updateQrcodeCoilId(qrcodeRecordId, add.getCoilId());
} }
// 设置返回用的ID并更新二维码内容中的coilId
bo.setCoilId(add.getCoilId());
updateQrcodeCoilId(qrcodeRecordId, add.getCoilId());
// 4. 返回完整的 VO包含关联对象 // 4. 返回完整的 VO包含关联对象
return queryById(add.getCoilId()); return queryById(add.getCoilId());
} }