rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(out-purchase): 添加扫码批次号和单位信息处理功能 

- 在出库采购控制器中新增批次号集合用于存储扫码批次信息
- 添加单位信息设置功能，从二维码主数据获取并设置到项目中
- 实现批次号去重合并功能，将多个批次号以逗号分隔形式存储
- 优化扫码数量累加逻辑，确保单位和批次信息正确关联
This commit is contained in:
曹鹏飞 2026-04-01 10:54:43 +08:00
parent 93d9572c83
commit be8c7cedb6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
View File

@ -159,6 +159,7 @@ public class OutPurchaseController extends BaseController {
item.setOrderId(orderId); item.setOrderId(orderId);
item.setNum(BigDecimal.ZERO); item.setNum(BigDecimal.ZERO);
item.setWerks(it.getWerks()); item.setWerks(it.getWerks());
Set<String> batchNo=new HashSet<>();
if (CollectionUtil.isNotEmpty(it.getQrCodes())) { if (CollectionUtil.isNotEmpty(it.getQrCodes())) {
it.getQrCodes().forEach(qrCode -> { it.getQrCodes().forEach(qrCode -> {
WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream() WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream()
@ -172,7 +173,9 @@ public class OutPurchaseController extends BaseController {
.throwMessage("物料" + it.getMatnr() + "与二维码不匹配"); .throwMessage("物料" + it.getMatnr() + "与二维码不匹配");
// VUtil.trueThrowBusinessError(!check(qrCodeMaster, it.getCharg(), it.getSernrs())) // VUtil.trueThrowBusinessError(!check(qrCodeMaster, it.getCharg(), it.getSernrs()))
// .throwMessage("物料" + it.getMatnr() + "包含不符合批次号和序列号的扫码记录"); // .throwMessage("物料" + it.getMatnr() + "包含不符合批次号和序列号的扫码记录");
item.setMeins(qrCodeMaster.getUnit());
item.setNum(item.getNum().add(qrCodeMaster.getQuantity())); item.setNum(item.getNum().add(qrCodeMaster.getQuantity()));
batchNo.add(qrCodeMaster.getBatchNo());
// qrCodeMaster.setFactoryCode(""); // qrCodeMaster.setFactoryCode("");
// qrCodeMaster.setStorageLocation(""); // qrCodeMaster.setStorageLocation("");
// qrCodeMaster.setBinLocation(""); // qrCodeMaster.setBinLocation("");
@ -203,6 +206,7 @@ public class OutPurchaseController extends BaseController {
); );
}); });
} }
item.setCharg(StrUtil.join(",", batchNo));
// VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0) // VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0)
// .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量"); // .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量");
// VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0) // VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0)