看板接口完成、完工入库接口调整

src/main/java/com/topsunit/scanservice/ximai/common/AppConfig.java

@@ -26,6 +26,9 @@ public class AppConfig {
     @Value("${topsunit.authentication-enabled}")
     private Boolean authenticationEnabled;
 
+    @Value("${topsunit.db-name}")
+    private String dbName;
+
     public  boolean getAuthenticationEnabled(){
         if(authenticationEnabled == null){
             return true;
@@ -46,4 +49,9 @@ public class AppConfig {
     public String getDefaultPassword(){
         return defaultPassword;
     }
+
+    public String getDbName() {
+        return dbName;
+    }
+
 }

src/main/java/com/topsunit/scanservice/ximai/dto/MoctgCreateParams.java

@@ -39,6 +39,8 @@ public class MoctgCreateParams {
     private Integer tg009=1;
     @ApiModelProperty("仓库")
     private String tg010;
+    @ApiModelProperty("审核码")
+    private String tg022="N";
     @ApiModelProperty("库位")
     private String tg036;
     @ApiModelProperty("库存单位")

src/main/java/com/topsunit/scanservice/ximai/entity/Moctg.java

@@ -63,6 +63,12 @@ public class Moctg extends EntityBase {
     private String tg037;
     @ApiModelProperty("入库数量")
     private BigDecimal tg011;
+
+    @ApiModelProperty("审核码")
+    private String tg022;
+
+    @ApiModelProperty("库存数量")
+    private BigDecimal tg038;
     /**
      * 工单单别
      */

src/main/java/com/topsunit/scanservice/ximai/security/AuthenticationInterceptor.java

@@ -56,7 +56,7 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
             if(!appConfig.getAuthenticationEnabled()){
                 CurrentActorSetter currentActorSetter = applicationContext.getBean(CurrentActorSetter.class);
                 currentActorSetter.setActor("CRMDS");
-                currentActorSetter.setCompany("DEMO");
+                currentActorSetter.setCompany(appConfig.getDbName());
                 return true;
             }
             else {

src/main/java/com/topsunit/scanservice/ximai/service/MoctfService.java

@@ -54,6 +54,7 @@ public class MoctfService {
             Invmc invmc = invmcDao.findById(new InvmcId(invmb.getMb001(), invmb.getMb017())).orElseThrow(()->new TopsunitException(String.format("未找到对应物料默认库：%s,%s", invmb.getMb001(), invmb.getMb017())));
             moctg.setTg036(invmc.getMc015());
             moctg.setTg030(currStr);
+            moctg.setTg038(moctg.getTg011());
             moctgDao.save(moctg);
         });
         moctf.setTf033(ta083.get());

src/main/resources/application-demo.yml

 topsunit:
   token-expires-hour: 8760
-  authentication-enabled: true
+  authentication-enabled: false
   print-api-url: http://192.168.1.107:8085/ximaiprintservice/print/PrintLabelByBarTender
   default-password: 123456
+  db-name: demo
 server:
-  port: 20090
+  port: 20091
   servlet:
     context-path: /
 logging:
@@ -26,8 +27,8 @@ spring:
   datasource:
     name: DEMO
     username: sa
-    password: 171sS171
-    url: jdbc:sqlserver://192.168.10.128:1433;DatabaseName=DEMO
+    password: 123qweQWE
+    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=DEMO
     type:  com.alibaba.druid.pool.DruidDataSource
     druid:
       filters: stat

src/main/resources/application-dev.yml

@@ -3,8 +3,9 @@ topsunit:
   authentication-enabled: false
   print-api-url: http://127.0.0.1:8085/ximaiprintservice/print/PrintLabelByBarTender
   default-password: 123456
+  db-name: TEST
 server:
-  port: 20090
+  port: 20091
   servlet:
     context-path: /
 logging:
@@ -14,6 +15,9 @@ logging:
       springframework:
         web: debug
     com.topsunit: debug
+    druid:
+      sql:
+        Statement: debug
 spring:
   devtools:
     restart:
@@ -25,9 +29,9 @@ spring:
       - classpath:/public/
   datasource:
     name: DEMO
-    username: top
-    password: t0psunit
-    url: jdbc:sqlserver://192.168.222.51:1433;DatabaseName=DEMO
+    username: sa
+    password: 123qweQWE
+    url: jdbc:sqlserver://localhost:1433;DatabaseName=Leader
     type:  com.alibaba.druid.pool.DruidDataSource
     druid:
       filters: stat
@@ -43,6 +47,20 @@ spring:
       test-on-return: false
       pool-prepared-statements: true
       max-open-prepared-statements: 20
+      filter:
+        slf4j:
+          enabled: true
+          statement-log-enabled: true
+          statement-create-after-log-enabled: false
+          statement-close-after-log-enabled: false
+          statement-executable-sql-log-enable: true
+          statement-prepare-after-log-enabled: false
+          statement-parameter-set-log-enabled: false
+          statement-execute-after-log-enabled: false
+          statement-execute-query-after-log-enabled: false
+          statement-execute-update-after-log-enabled: false
+          statement-execute-batch-after-log-enabled: false
+          statement-sql-pretty-format: false
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   jackson:
     serialization:

src/main/resources/application-dscsys.yml

-topsunit:
-  token-expires-hour: 8760
-  authentication-enabled: true
-  print-api-url: http://192.168.1.107:8085/ximaiprintservice/print/PrintLabelByBarTender
-  default-password: 123456
-server:
-  port: 20090
-  servlet:
-    context-path: /
-logging:
-  level:
-    root: info
-    org:
-      springframework:
-        web: info
-    com.topsunit: info
-spring:
-  devtools:
-    restart:
-      additional-paths:
-        - src/main/resources
-  resources:
-    static-locations:
-      - classpath:/static/
-      - classpath:/public/
-  datasource:
-    name: DEMO
-    username: top
-    password: t0psunit
-    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=DSCSYS
-    type:  com.alibaba.druid.pool.DruidDataSource
-    druid:
-      filters: stat
-      max-active: 20
-      initial-size: 1
-      max-wait: 60000
-      min-idle: 1
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 30000
-      validation-query: select 'x'
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-open-prepared-statements: 20
-    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  jackson:
-    serialization:
-      indent-output: true
-  jpa:
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: com.topsunit.scanservice.ximai.common.PhysicalNamingStrategyUpperCaseImpl
-    show-sql: true
-  application:
-    name: topsunit-scan-dscsys

src/main/resources/application-local.yml

-topsunit:
-  token-expires-hour: 8760
-  authentication-enabled: true
-  print-api-url: http://192.168.31.210:8085/ximaiprintservice/print/PrintLabelByBarTender
-  default-password: 123456
-server:
-  port: 20090
-  servlet:
-    context-path: /
-logging:
-  level:
-    root: warn
-    org:
-      springframework:
-        web: debug
-    com.topsunit: debug
-spring:
-  devtools:
-    restart:
-      additional-paths:
-        - src/main/resources
-  resources:
-    static-locations:
-      - classpath:/static/
-      - classpath:/public/
-  datasource:
-    name: DEMO
-    username: top
-    password: t0psunit
-    url: jdbc:sqlserver://192.168.31.131:1433;DatabaseName=DEMO
-    type:  com.alibaba.druid.pool.DruidDataSource
-    druid:
-      filters: stat
-      max-active: 20
-      initial-size: 1
-      max-wait: 60000
-      min-idle: 1
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 30000
-      validation-query: select 'x'
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-open-prepared-statements: 20
-    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  jackson:
-    serialization:
-      indent-output: true
-  jpa:
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: com.topsunit.scanservice.ximai.common.PhysicalNamingStrategyUpperCaseImpl
-    show-sql: true
-  application:
-    name: topsunit-scan-ximai

src/main/resources/application-prd.yml

-topsunit:
-  token-expires-hour: 8760
-  authentication-enabled: true
-  print-api-url: http://127.0.0.1:8085/ximaiprintservice/print/PrintLabelByBarTender
-  default-password: 123456
-server:
-  port: 20090
-  servlet:
-    context-path: /
-logging:
-  level:
-    root: info
-    org:
-      springframework:
-        web: info
-    com.topsunit: info
-spring:
-  devtools:
-    restart:
-      additional-paths:
-        - src/main/resources
-  resources:
-    static-locations:
-      - classpath:/static/
-      - classpath:/public/
-  datasource:
-    name: DEMO
-    username: top
-    password: t0psunit
-    url: jdbc:sqlserver://192.168.222.51:1433;DatabaseName=DEMO
-    type:  com.alibaba.druid.pool.DruidDataSource
-    druid:
-      filters: stat
-      max-active: 20
-      initial-size: 1
-      max-wait: 60000
-      min-idle: 1
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 30000
-      validation-query: select 'x'
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-open-prepared-statements: 20
-    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  jackson:
-    serialization:
-      indent-output: true
-  jpa:
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: com.topsunit.scanservice.ximai.common.PhysicalNamingStrategyUpperCaseImpl
-    show-sql: true
-  application:
-    name: topsunit-scan-ximai

src/main/resources/application-thximai.yml

@@ -3,6 +3,7 @@ topsunit:
   authentication-enabled: false
   print-api-url: http://192.168.1.107:8085/ximaiprintservice/print/PrintLabelByBarTender
   default-password: 123456
+  db-name: Leader
 server:
   port: 20091
   servlet:

src/main/resources/application-ximai.yml

 topsunit:
   token-expires-hour: 8760
-  authentication-enabled: true
+  authentication-enabled: false
   print-api-url: http://192.168.1.107:8085/ximaiprintservice/print/PrintLabelByBarTender
   default-password: 123456
+  db-name: XIMAI
 server:
   port: 20091
   servlet:
@@ -24,10 +25,10 @@ spring:
       - classpath:/static/
       - classpath:/public/
   datasource:
-    name: XIMAI
-    username: top
-    password: t0psunit
-    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=XIMAI
+    name: Leader
+    username: sa
+    password: 123qweQWE
+    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=Leader
     type:  com.alibaba.druid.pool.DruidDataSource
     druid:
       filters: stat

src/main/resources/application.yml

 spring:
   profiles:
     active:
-      - demo
+      - dev
\ No newline at end of file