Merge branch 'develop' into qms/develop

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

@@ -643,6 +643,7 @@ public class NormalPGIController extends BaseController {
     @ApiMark(moduleName = "送货单管理", apiName = "收货确认")
     public ApiResult<Void> takeDelivery(@Valid @RequestBody List<SrmMaterialReceiptQO> request) {
         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();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在");
         List<SAPSyncParamsDTO> sapSyncParamsDTOS = getSapSyncParamsDTOS(request, order);

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

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