批次规则bug修改

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java

@@ -120,7 +120,11 @@ public class MaterialBaseInfoApplicationService {
             throw new ServiceException("获取货主信息失败");
         }
         UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
-        materialBaseInfoDO.setShipperName(userPo.getUserName());
+        // 如果原始shipperName不为空，保留原始值（导入或手动输入时应该保留完整名称）
+        // 只有在原始shipperName为空时，才使用查询到的userName
+        if (materialBaseInfoDO.getShipperName() == null || materialBaseInfoDO.getShipperName().trim().isEmpty()) {
+            materialBaseInfoDO.setShipperName(userPo.getUserName());
+        }
     }
 
     public List<MaterialStockInfoVo> getMaterialStockList(String shipperName, String materialName,