云顶对接项目更新

src/main/java/com/uas/eis/serviceImpl/StockServiceImpl.java

@@ -290,6 +290,12 @@ public class StockServiceImpl implements StockService{
             case "其它入库单":
                 correctQty = inQty;
                 break;
+            case "借货出货单":
+                correctQty = outQty;
+                break;
+            case "借货归还单":
+                correctQty = inQty;
+                break;
             default:break;
         }
         return correctQty;
@@ -324,6 +330,9 @@ public class StockServiceImpl implements StockService{
             case "其它入库单":
                 orderType = 0;
                 break;
+            case "借货归还单":
+                orderType = 0;
+                break;
             case "拨出单":
                 orderType = 1;
                 break;
@@ -336,6 +345,9 @@ public class StockServiceImpl implements StockService{
             case "其它出库单":
                 orderType = 2;
                 break;
+            case "借货出货单":
+                orderType = 2;
+                break;
             default:break;
         }
         return orderType;

src/main/java/com/uas/eis/task/SaleReturnTask.java

@@ -2,7 +2,6 @@ package com.uas.eis.task;
 
 import com.uas.eis.service.SaleReturnService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
@@ -14,7 +13,7 @@ public class SaleReturnTask {
     @Autowired
     SaleReturnService saleReturnService;
 
-    @Scheduled(cron = "0 0 0/1 * * ?")
+//    @Scheduled(cron = "0 0 0/1 * * ?")
     public void getSaleReturn() {
         saleReturnService.getSaleReturn();
     }

src/main/java/com/uas/eis/task/SaleTask.java

@@ -1,9 +1,7 @@
 package com.uas.eis.task;
 
 import com.uas.eis.service.SaleService;
-import com.uas.eis.service.StockService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
@@ -16,7 +14,7 @@ public class SaleTask {
     SaleService saleService;
 
 
-    @Scheduled(cron = "0 0/55 * * * ?")
+//    @Scheduled(cron = "0 0/55 * * * ?")
     public void getSale() {
         saleService.getSale();
     }

src/main/java/com/uas/eis/task/StockTask.java

@@ -2,7 +2,6 @@ package com.uas.eis.task;
 
 import com.uas.eis.service.StockService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
@@ -14,7 +13,7 @@ public class StockTask {
     @Autowired
     StockService stockService;
 
-    @Scheduled(cron = "0 0/50 * * * ?")
+//    @Scheduled(cron = "0 0/50 * * * ?")
     public void autoPost() {
         stockService.autoPost(); //出入库定时过账
     }

src/main/resources/application.yml

@@ -4,6 +4,7 @@ spring:
         driverClassName: oracle.jdbc.OracleDriver
         username: yunding
         password: select!#%@$^
+#        url: jdbc:oracle:thin:@oclean.uicp.net:1521:orcl
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 10
         maxActive: 80

src/main/resources/logback-spring.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <!-- 日志文件路径 -->
-    <property name="LOG_PATH" value="/usr/local/log/uas-eis" />
-
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-
-    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <!-- springboot默认配置 -->
-            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(18971){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx</pattern>
-        </layout>
-    </appender>
-
-    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>DENY</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-        <encoder>
-            <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} -%msg%n</pattern>
-        </encoder>
-        <!--滚动策略-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--路径,将"-"换成"/"可以根据日期产生路径-->
-            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info.%d.log</fileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>60</MaxHistory>
-        </rollingPolicy>
-    </appender>
-    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-        <encoder>
-            <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} -%msg%n</pattern>
-        </encoder>
-        <!--滚动策略-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--路径,将"-"换成"/"可以根据日期产生路径-->
-            <fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error.%d.log</fileNamePattern>
-            <!--日志文件保留天数-->
-            <MaxHistory>60</MaxHistory>
-        </rollingPolicy>
-    </appender>
-    <root level="info">
-        <appender-ref ref="consoleLog" />
-        <appender-ref ref="fileInfoLog" />
-        <appender-ref ref="fileErrorLog" />
-    </root>
-</configuration> 

src/main/resources/logback.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<appender name="FILE"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<File>logs/log.log</File>
+		<encoder>
+			<pattern>
+				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
+			</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- daily rollover -->
+			<FileNamePattern>logs/log.%d{yyyy-MM-dd}.log</FileNamePattern>
+			<!-- keep 10 days' worth of history -->
+			<maxHistory>10</maxHistory>
+		</rollingPolicy>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+	</appender>
+
+	<!-- Console output -->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<!-- encoder defaults to ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+		<encoder>
+			<pattern>
+				%date{yyyy-MM-dd HH:mm:ss:SSS} [%relative ms] %-5level [%50.50(%logger{36}.%method:%line)] ---- %msg%n
+			</pattern>
+			<charset>UTF-8</charset> <!-- 此处设置字符集 -->
+		</encoder>
+		<!-- Only log level WARN and above -->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+	</appender>
+
+	<!-- Enable FILE and STDOUT appenders for all log messages. By default, 
+		only log at level INFO and above. -->
+	<root level="INFO">
+		<appender-ref ref="FILE" />
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,5 +1,7 @@
 package com.uas.eis;
 
+import com.uas.eis.dao.BaseDao;
+import com.uas.eis.service.SaleReturnService;
 import com.uas.eis.service.SaleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -13,10 +15,17 @@ public class UasEisApplicationTests {
 
 	@Autowired
 	private SaleService SaleService;
+	@Autowired
+	private SaleReturnService SaleReturnService;
+	@Autowired
+	private BaseDao baseDao;
+
 
 	@Test
 	public void contextLoads() {
-		SaleService.getSale();
+
+
+
 	}
 
 }