Browse Source

需求优化

chen 5 days ago
parent
commit
1937788a33

+ 4 - 0
yudao-module-contract/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/dal/dataobject/order/OrderDetailsDO.java

@@ -159,6 +159,10 @@ public class OrderDetailsDO extends BaseDO {
      * 品种
      */
     private String zzpz;
+    /**
+     * 单价折扣备注
+     */
+    private String zzdjzkbz;
     /**
      * 网络/捻向
      */

+ 40 - 4
yudao-module-contract/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/webservice/ZJS004I.java

@@ -70,6 +70,8 @@ public class ZJS004I  implements java.io.Serializable {
 
     private String ZZPZ;
 
+    private String ZZDJZKBZ;
+
     public ZJS004I() {
     }
 
@@ -104,7 +106,8 @@ public class ZJS004I  implements java.io.Serializable {
            String MTART,
            String ZWLSX,
            String ZZCPGG2,
-           String ZZPZ) {
+           String ZZPZ,
+           String ZZDJZKBZ) {
            this.VBELN = VBELN;
            this.POSNR = POSNR;
            this.SPART = SPART;
@@ -136,6 +139,7 @@ public class ZJS004I  implements java.io.Serializable {
            this.ZWLSX = ZWLSX;
            this.ZZCPGG2 = ZZCPGG2;
            this.ZZPZ = ZZPZ;
+           this.ZZDJZKBZ = ZZDJZKBZ;
     }
 
 
@@ -758,6 +762,26 @@ public class ZJS004I  implements java.io.Serializable {
         this.ZZPZ = ZZPZ;
     }
 
+
+    /**
+     * Gets the ZZDJZKBZ value for this ZJS004I.
+     *
+     * @return ZZDJZKBZ
+     */
+    public String getZZDJZKBZ() {
+        return ZZDJZKBZ;
+    }
+
+
+    /**
+     * Sets the ZZDJZKBZ value for this ZJS004I.
+     *
+     * @param ZZDJZKBZ
+     */
+    public void setZZDJZKBZ(String ZZDJZKBZ) {
+        this.ZZDJZKBZ = ZZDJZKBZ;
+    }
+
     private Object __equalsCalc = null;
     public synchronized boolean equals(Object obj) {
         if (!(obj instanceof ZJS004I)) return false;
@@ -857,12 +881,15 @@ public class ZJS004I  implements java.io.Serializable {
             ((this.ZWLSX==null && other.getZWLSX()==null) || 
              (this.ZWLSX!=null &&
               this.ZWLSX.equals(other.getZWLSX()))) &&
-            ((this.ZZCPGG2==null && other.getZZCPGG2()==null) || 
+            ((this.ZZCPGG2==null && other.getZZCPGG2()==null) ||
              (this.ZZCPGG2!=null &&
               this.ZZCPGG2.equals(other.getZZCPGG2()))) &&
-            ((this.ZZPZ==null && other.getZZPZ()==null) || 
+            ((this.ZZPZ==null && other.getZZPZ()==null) ||
              (this.ZZPZ!=null &&
-              this.ZZPZ.equals(other.getZZPZ())));
+              this.ZZPZ.equals(other.getZZPZ()))) &&
+            ((this.ZZDJZKBZ==null && other.getZZDJZKBZ()==null) ||
+             (this.ZZDJZKBZ!=null &&
+              this.ZZDJZKBZ.equals(other.getZZDJZKBZ())));
         __equalsCalc = null;
         return _equals;
     }
@@ -967,6 +994,9 @@ public class ZJS004I  implements java.io.Serializable {
         if (getZZPZ() != null) {
             _hashCode += getZZPZ().hashCode();
         }
+        if (getZZDJZKBZ() != null) {
+            _hashCode += getZZDJZKBZ().hashCode();
+        }
         __hashCodeCalc = false;
         return _hashCode;
     }
@@ -1163,6 +1193,12 @@ public class ZJS004I  implements java.io.Serializable {
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("ZZDJZKBZ");
+        elemField.setXmlName(new javax.xml.namespace.QName("", "ZZDJZKBZ"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
     }
 
     /**

+ 1 - 1
yudao-server/src/main/resources/application-dev.yaml

@@ -43,7 +43,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://10.5.5.151:3306/xshtdb?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://10.5.5.151:3306/xshtdb?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true&connectTimeout=60000&socketTimeout=60000 # MySQL Connector/J 8.X 连接的示例
           username: xshtadmin
           password: Xsht.123456
 #        slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改