Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -18,7 +18,7 @@ public interface MaxnumberService {
      * @Author: guq
      * @Date: 2018/10/19 api/commons
      */
-    @PostMapping("/number/pushMaxnubmer")
+    @PostMapping("/api/commons/number/pushMaxnubmer")
     public Result<String> pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
                                 @RequestParam("caller") String caller);
     /**
@@ -28,6 +28,6 @@ public interface MaxnumberService {
      * @Author: guq
      * @Date: 2018/10/22
      */
-    @PostMapping("/getMaxnumber")
+    @PostMapping("/api/commons/numnber/getMaxnumber")
     public Result<String> getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
 }

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -13,27 +13,27 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @FeignClient("commons-server")
 public interface MessageLogService {
 
-    @RequestMapping("/save")
+    @RequestMapping("/api/commons/messagelog/save")
     public void save(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/update")
+    @RequestMapping("/api/commons/messagelog/update")
     public void update(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/delete")
+    @RequestMapping("/api/commons/messagelog/delete")
     public void delete(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/deleteDetail")
+    @RequestMapping("/api/commons/messagelog/deleteDetail")
     public void deleteDetail(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/audit")
+    @RequestMapping("/api/commons/messagelog/audit")
     public void audit(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/unAudit")
+    @RequestMapping("/api/commons/messagelog/unAudit")
     public void unAudit(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/close")
+    @RequestMapping("/api/commons/messagelog/close")
     public void close(@RequestBody DocBaseDTO baseDTO);
 
-    @RequestMapping("/open")
+    @RequestMapping("/api/commons/messagelog/open")
     public void open(@RequestBody DocBaseDTO baseDTO);
 }

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -26,7 +26,9 @@ public enum BizExceptionCode implements BaseExceptionCode {
     //采购
 
     //销售
-
+    SALE_ALL_TURNOUT(72000, "该销售单已全部转出货,无法转出货单"),
+    SALE_CLOSE(72001, "单据已关闭,无法进行操作"),
+    SALE_YQTYBEYONDQTY(72001, "明细行已转数量大于数量");
     //资金
 
     //库存

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/CommonsController.java

@@ -1,19 +0,0 @@
-package com.usoftchina.saas.commons.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author: guq
- * @create: 2018-10-18 15:53
- **/
-@RestController
-@RequestMapping("/commons")
-public class CommonsController {
-
-    @RequestMapping("/test")
-    public String test() {
-        return "TEST";
-    }
-
-}

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MaxnumberController.java

@@ -10,9 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author: guq
  * @create: 2018-10-18 17:40

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MessageLogController.java

@@ -5,12 +5,14 @@ import com.usoftchina.saas.commons.service.MessageLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author: guq
  * @create: 2018-10-20 11:46
  **/
 @RequestMapping("/messagelog")
+@RestController
 public class MessageLogController {
 
     @Autowired

applications/commons/commons-server/src/main/resources/application.yml

@@ -23,8 +23,8 @@ spring:
     host: 192.168.0.176
     port: 5672
     virtual-host: dev
-    password: saas
-    username: select123***
+    username: saas
+    password: select123***
   zipkin:
     sender:
       type: rabbit

applications/sale/sale-server/pom.xml

@@ -10,12 +10,96 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sale-server</artifactId>
+    
     <dependencies>
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>sale-dto</artifactId>
         </dependency>
-    </dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>storage-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>purchase-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>auth-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>server-starter</artifactId>
+        </dependency>
+
+        <!--test-->
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>test-starter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- db -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- sleuth -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- feign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-api</artifactId>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>