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

Merge branch 'master' into develop

This commit is contained in:
曹鹏飞 2026-06-16 18:03:26 +08:00
parent 8b96a52163 ac440cb861
commit 79010e82f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -189,6 +189,7 @@ public class NormalPGIController extends BaseController {
@ApiMark(moduleName = "送货单管理", apiName = "收货确认") @ApiMark(moduleName = "送货单管理", apiName = "收货确认")
public ApiResult<Void> takeDelivery(@Valid @RequestBody List<SrmMaterialReceiptQO> request) { public ApiResult<Void> takeDelivery(@Valid @RequestBody List<SrmMaterialReceiptQO> request) {
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("收货参数为空"); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request)).throwMessage("收货参数为空");
request.removeIf(it -> CollectionUtil.isEmpty(it.getScanCodes()));
WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, request.get(0).getNoteNum()).one(); WmsSrmOrder order = wmsSrmOrderService.lambdaQuery().eq(WmsSrmOrder::getNoteNum, request.get(0).getNoteNum()).one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在");
List<SAPSyncParamsDTO> sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order); List<SAPSyncParamsDTO> sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order);
@ -223,7 +224,7 @@ public class NormalPGIController extends BaseController {
for (SrmMaterialReceiptQO item : request) { for (SrmMaterialReceiptQO item : request) {
if (item.getReceiptNum().equals(BigDecimal.ZERO)) if (item.getReceiptNum().compareTo(BigDecimal.ZERO)==0)
continue; continue;
// 处理二维码 // 处理二维码
List<PDAScanCodeQO> autoFindChildCodes = Lists.newArrayList(); List<PDAScanCodeQO> autoFindChildCodes = Lists.newArrayList();

1
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java
View File

@ -49,7 +49,6 @@ public class SrmMaterialReceiptQO {
/** /**
* 实际收货数量 * 实际收货数量
*/ */
@NotNull
private BigDecimal receiptNum; private BigDecimal receiptNum;
/** /**