From 00a44859a673b388e1dca5f54c4ecaffc5fee30e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 19 三月 2026 10:21:08 +0800
Subject: [PATCH] lsh#0:新增、更新、解禁(只要调用了更新,就代表非禁用了)  1:禁用

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/ErpReportServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 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 d982b35..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;
@@ -260,16 +262,24 @@
      */
     private List<Map<String, Object>> customerToCompaniesParams(List<Customer> customerList) {
         List<Map<String, Object>> mappedList = new ArrayList<>();
+        int rowNum = 0;
         for (Customer customer : customerList) {
+            rowNum++;
             if (Objects.isNull(customer)) {
                 continue;
+            }
+            if (StringUtils.isBlank(customer.getCustomerId())) {
+                throw new CoolException("瀹㈡埛鍚屾澶辫触锛氱" + rowNum + "琛屽鎴风紪鐮佷负绌�");
+            }
+            if (StringUtils.isBlank(customer.getCustomerName())) {
+                throw new CoolException("瀹㈡埛鍚屾澶辫触锛氱" + rowNum + "琛屽鎴峰悕绉颁负绌�");
             }
             Map<String, Object> map = new HashMap<>();
             map.put("name", customer.getCustomerName());
             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());
@@ -278,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;
@@ -306,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