Merge branch 'develop' into qms/develop

nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java

@@ -770,10 +770,15 @@ public class MaterialCodeController extends BaseController {
                 .toList();
         VUtil.trueThrowBusinessError(materialIds.isEmpty()).throwMessage("物料ID不能为空");
 
-        // 根据前端传入的物料ID查询对应的物料编号再查询物料主数据
-        List<WmsShipmentMaterialCodeItem> materialCodeItems = materialCodeItemService.lambdaQuery()
+        List<WmsShipmentMaterialCodeItem> materialCodeItems;
+        if (CollectionUtil.isNotEmpty(materialIds)) {
+            materialCodeItems = materialCodeItemService.lambdaQuery()
                     .in(WmsShipmentMaterialCodeItem::getId, materialIds)
                     .list();
+        } else {
+            materialCodeItems = new ArrayList<>();
+        }
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(materialCodeItems)).throwMessage("未查询到物料信息");
 
         List<String> materialNos = materialCodeItems.stream()
                 .map(WmsShipmentMaterialCodeItem::getMaterialNo)