tijiao

pom.xml

@@ -105,14 +105,13 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.63:1521:ORCL</connUrl>
+                    <user>dzgt</user>
+                    <password>bigdata</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_CONTAACT_PRICE_MATERIAL</param>-->
+                        <param>TB_PRODUCT_SUMMARY_DG</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1876,7 +1876,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         head.put("status",status);
         input.put("head",head);
         // 测试
-        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+        Map<String, Object> totalMap = easUtil.getTotalMap();
         // 正式
 //        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
         input.put("head",head);
@@ -1915,7 +1915,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         head.put("status",status);
         input.put("head",head);
         // 测试
-        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+        Map<String, Object> totalMap = easUtil.getTotalMap();
         // 正式
 //        Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
         input.put("head",head);

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -1959,7 +1959,6 @@
     ON R_SALER.SALER_ID = a_s_order.SALER_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
-    and a_s_order.DELETED = 0
     and ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout