From 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 10:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
index 24f913e..a7dc524 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java
@@ -126,6 +126,7 @@
map.put("spec", material.getSpec());
map.put("describle", material.getDescribe());
map.put("unit", material.getUnit());
+ map.put("operateType", material.getOperateType());
mappedList.add(map);
}
return mappedList;
@@ -250,6 +251,7 @@
map.put("type", null);
map.put("longitude", null);
map.put("latitude", null);
+ map.put("operateType", warehouse.getOperateType());
mappedList.add(map);
}
return mappedList;
@@ -277,7 +279,7 @@
map.put("nameEn", null);
map.put("breifCode", customer.getCustomerNickName());
// server 绔被鍨嬭浆鎹娇鐢ㄤ腑鏂囨弿杩�
- map.put("type", customer.getType());
+ map.put("type", "瀹㈡埛");
map.put("contact", customer.getContact());
map.put("tel", customer.getTelephone());
map.put("email", customer.getEmail());
@@ -286,6 +288,7 @@
map.put("province", null);
map.put("address", customer.getAddress());
map.put("code", customer.getCustomerId());
+ map.put("operateType", customer.getOperateType());
mappedList.add(map);
}
return mappedList;
@@ -314,6 +317,7 @@
map.put("province", null);
map.put("address", supplier.getAddress());
map.put("code", supplier.getSupplierId());
+ map.put("operateType", supplier.getOperateType());
mappedList.add(map);
}
return mappedList;
--
Gitblit v1.9.1