From 0d02fc16bcf3d99a606ef5c89c3f65ce6e8794fc Mon Sep 17 00:00:00 2001
From: zzs <hi@vio.vin>
Date: Mon, 20 Jan 2025 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A2=E6=88=B7=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B=E5=8D=95=E5=B9=B3=E5=8F=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E4=B8=BB=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yem/or/api/AssepcDynamic.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/yem/or/api/AssepcDynamic.java b/src/main/java/com/yem/or/api/AssepcDynamic.java
index 792a2bdc..81c2e8bc 100644
--- a/src/main/java/com/yem/or/api/AssepcDynamic.java
+++ b/src/main/java/com/yem/or/api/AssepcDynamic.java
@@ -112,14 +112,14 @@ public class AssepcDynamic {
      * @throws IOException
      */
     @ApiPostMapping("/assepcdynamic/qurtbillno")
-    public CustomApiResult<Object> qurtbillno(@NotNull @ApiParam("客户编码") String number) throws IOException {
+    public CustomApiResult<Object> qurtbillno(@NotNull @ApiParam("客户.业务主体.下单平台ID") String number) throws IOException {
         JSONObject object = new JSONObject();
         try {
             JSONArray jsonArray = new JSONArray();
             QFilter qFilter = new QFilter("createorg.number", QCP.equals, "110");
             qFilter.and("status", QCP.equals, "C");
             if (!StringUtils.containsIgnoreCase(number, "admin")) {
-                qFilter.and("yem_customer.number", QCP.equals, number);
+                qFilter.and("yem_customer.yem_groupcustomers.yem_torderid", QCP.equals, number);
             }
 //            qFilter.and("yem_billtype.number", QCP.equals, "yem_es_salesorder_ZJ");
             String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false);
@@ -170,7 +170,7 @@ public class AssepcDynamic {
     public CustomApiResult<Object> modelquery(
             @NotNull @ApiParam("订单号(number)、产品机型(number)") String number,
             @NotNull @ApiParam("searchap3（订单号）,searchap4（产品机型）") String searchap,
-            @ApiParam("客户编码，查询产品机型必传") String custom) throws IOException {
+            @ApiParam("客户.业务主体.下单平台ID，查询产品机型必传") String custom) throws IOException {
         JSONObject object = new JSONObject();
         try {
             JSONArray jsonArray = new JSONArray();
@@ -186,7 +186,7 @@ public class AssepcDynamic {
                 qFilters.add(new QFilter("yem_model.yem_products.number", QCP.equals, number));
                 if (YEM.isNotEmpty(custom)) {
                     if ((!StringUtils.containsIgnoreCase(custom, "admin"))) {
-                        qFilters.add(new QFilter("yem_customer.number", QCP.equals, custom));
+                        qFilters.add(new QFilter("yem_customer.yem_groupcustomers.yem_torderid", QCP.equals, custom));
                     }
                 } else {
                     return CustomApiResult.fail("501", "客户编码为空！");
@@ -447,11 +447,11 @@ public class AssepcDynamic {
     }
 
     @ApiPostMapping("/assepcdynamic/electronic_group")
-    public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.编码(116021200012)") String number) {
+    public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.业务主体.下单平台ID") String number) {
         List<Map<String, Object>> result = new ArrayList<>();
         QFilter qFilter = new QFilter("status", QCP.equals, "C");
         if (!StringUtils.containsIgnoreCase(number, "admin")) {
-            qFilter.and(new QFilter("yem_customer.number", QCP.equals, number));
+            qFilter.and(new QFilter("yem_customer.yem_groupcustomers.yem_torderid", QCP.equals, number));
         }
         String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
         DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
@@ -670,11 +670,11 @@ public class AssepcDynamic {
      * @return
      */
     @ApiPostMapping("/assepcdynamic/queassequipment")
-    public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
+    public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户.业务主体.下单平台ID") String customerNo) {
         String algoKey = this.getClass().getName();
         QFilter qFilter = new QFilter("status", "=", "C");
         if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
-            qFilter.and("yem_customer.number", "=", customerNo);
+            qFilter.and("yem_customer.yem_groupcustomers.yem_torderid", "=", customerNo);
         }
         qFilter.and("yem_model", "is not null", null);
         ArrayList<String> list = Lists.newArrayList();
@@ -804,11 +804,11 @@ public class AssepcDynamic {
     }
 
     @ApiPostMapping("bayed_product_model")
-    public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
+    public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户.业务主体.下单平台ID") String customerNo) {
         String algoKey = this.getClass().getName();
         QFilter qFilter = new QFilter("status", "=", "C");
         if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
-            qFilter.and("yem_customer.number", "=", customerNo);
+            qFilter.and("yem_customer.yem_groupcustomers.yem_torderid", "=", customerNo);
         }
         qFilter.and("group", "is not null", null);
         ArrayList<String> list = Lists.newArrayList();