From b68d6ccc865eefc57362b6cd8ebb7b1737b14f6f Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 13 Dec 2023 14:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/domain/sap/SapCloseOrderQuery.java   |  8 ++++++++
 .../op/system/api/domain/sap/SapCreateOrder.java    | 13 ++++++++-----
 .../java/com/op/system/api/domain/sap/SapRFW.java   |  2 +-
 .../op/system/api/domain/sap/SapRouterQuery.java    | 11 +++++++++++
 .../op/system/api/domain/sap/SapShopOrderQuery.java |  2 +-
 op-modules/op-plan/src/main/resources/bootstrap.yml | 12 ++++++------
 6 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
index f051c15a..11066d7b 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java
@@ -20,4 +20,12 @@ public class SapCloseOrderQuery {
     public void setOrder(String order) {
         this.order = order;
     }
+
+    @Override
+    public String toString() {
+        return "SapCloseOrderQuery{" +
+                "leadOrder='" + leadOrder + '\'' +
+                ", order='" + order + '\'' +
+                '}';
+    }
 }
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCreateOrder.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCreateOrder.java
index 36c7ed9c..358a1942 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCreateOrder.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCreateOrder.java
@@ -5,16 +5,17 @@ package com.op.system.api.domain.sap;
  */
 public class SapCreateOrder {
 
+    //计划工厂
     private String werks;
-
+    //订单类型
     private String aufpar;
-
+    //物料编号
     private String matnr;
-
+    //数量
     private String quantity;
-
+    //开始时间
     private String dates;
-
+    //完成时间
     private String datee;
 
 
@@ -66,6 +67,8 @@ public class SapCreateOrder {
         this.datee = datee;
     }
 
+
+
     //    @NotNull(message = "计划工厂不能为空")
 //    @NotBlank(message = "计划工厂不能为空")
 //    @Size(min = 0, max = 4, message = "计划工厂长度不能超过4个字符")
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
index 19a581c8..534fd004 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
@@ -114,7 +114,7 @@ public class SapRFW {
         }
 
     }
-    public class lt_hw{
+    public static class lt_hw{
 
         String material;
         String entry_qnt;
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRouterQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRouterQuery.java
index 7ca543c3..1d52b49f 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRouterQuery.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRouterQuery.java
@@ -52,4 +52,15 @@ public class SapRouterQuery {
     public void setAedat(String aedat) {
         this.aedat = aedat;
     }
+
+    @Override
+    public String toString() {
+        return "SapRouterQuery{" +
+                "matnr='" + matnr + '\'' +
+                ", werks='" + werks + '\'' +
+                ", arbpl='" + arbpl + '\'' +
+                ", andat='" + andat + '\'' +
+                ", aedat='" + aedat + '\'' +
+                '}';
+    }
 }
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapShopOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapShopOrderQuery.java
index 25e5d2b7..3b9e0f50 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapShopOrderQuery.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapShopOrderQuery.java
@@ -58,6 +58,6 @@ public class SapShopOrderQuery {
         return "{aufnr:"+":"+getAufnr()+","+
                 "matnr"+":"+getMatnr()+","+
                 "erdat"+":"+getErdat()+","+
-                "erdat"+":"+getWerk()+"}";
+                "werk"+":"+getWerk()+"}";
     }
 }
diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml
index 39d689e4..89a3d22c 100644
--- a/op-modules/op-plan/src/main/resources/bootstrap.yml
+++ b/op-modules/op-plan/src/main/resources/bootstrap.yml
@@ -13,15 +13,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
       config:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置