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

修改bug

Browse Source
This commit is contained in:
86156
2025-10-29 15:50:46 +08:00
parent ed2a56cded
commit caa25c0b9d
1 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,11 +189,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
Long qrcodeRecordId = generateQrcodeForInsert(bo); Long qrcodeRecordId = generateQrcodeForInsert(bo);
bo.setQrcodeRecordId(qrcodeRecordId); bo.setQrcodeRecordId(qrcodeRecordId);
// 2. 如果warehouseId为空，查找或创建stock // 2. 查找或创建stock
if (bo.getWarehouseId() == null) {
Long warehouseId = findOrCreateStock(bo); Long warehouseId = findOrCreateStock(bo);
bo.setWarehouseId(warehouseId); bo.setWarehouseId(warehouseId);
}
// 3. 插入钢卷数据 // 3. 插入钢卷数据
WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
@@ -269,7 +268,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
throw new RuntimeException("物品类型和物品ID不能为空"); throw new RuntimeException("物品类型和物品ID不能为空");
} }
// 查询是否存在相同的stock // 查询是否存在相同的stock（匹配itemType和itemId）
WmsStockBo stockBo = new WmsStockBo(); WmsStockBo stockBo = new WmsStockBo();
stockBo.setItemType(bo.getItemType()); stockBo.setItemType(bo.getItemType());
stockBo.setItemId(bo.getItemId()); stockBo.setItemId(bo.getItemId());
@@ -279,13 +278,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 如果找到相同的stock，返回第一个的warehouseId // 如果找到相同的stock，返回第一个的warehouseId
return stockList.get(0).getWarehouseId(); return stockList.get(0).getWarehouseId();
} else { } else {
// 如果没有找到，创建一个新的stock // 如果没有找到匹配的stock，新增一条stock记录
WmsStock newStock = new WmsStock(); WmsStockBo newStockBo = new WmsStockBo();
newStock.setItemType(bo.getItemType()); newStockBo.setItemType(bo.getItemType());
newStock.setItemId(bo.getItemId()); newStockBo.setItemId(bo.getItemId());
// 新创建的stock没有指定warehouse，可以为null // 如果有指定warehouseId，使用指定的；否则为null
stockMapper.insert(newStock); if (bo.getWarehouseId() != null) {
return newStock.getWarehouseId(); newStockBo.setWarehouseId(bo.getWarehouseId());
}
// 调用stockService新增stock
Boolean insertResult = stockService.insertByBo(newStockBo);
if (!insertResult) {
throw new RuntimeException("新增库存记录失败");
}
// 返回新创建的stock的warehouseId
return newStockBo.getWarehouseId();
} }
} }
@@ -672,6 +679,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
throw new RuntimeException("生成合卷二维码失败: " + e.getMessage()); throw new RuntimeException("生成合卷二维码失败: " + e.getMessage());
} }
} }
/** /**
* 更新二维码内容中的coilId * 更新二维码内容中的coilId
*/ */