完工入库单创建字段默认调整

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

+package com.topsunit.scanservice.ximai.common;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                .maxAge(3600);
+    }
+}

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

@@ -53,10 +53,14 @@ public class MoctgCreateParams {
     private String tg015;
     @ApiModelProperty("检验状态")
     private String tg016="0";
+    @ApiModelProperty("批号")
+    private String tg017="********************";
     @ApiModelProperty("急料")
     private String tg024;
     @ApiModelProperty("生产日期")
     private String tg030;
+    @ApiModelProperty("批号说明")
+    private String tg031="";
     @ApiModelProperty("报废数量")
     private BigDecimal tg012=BigDecimal.ZERO;
     @ApiModelProperty("验退数量")

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

@@ -17,7 +17,7 @@ import java.util.List;
 public class PurtgCreateParams {
     @ApiModelProperty("到货单别")
     private String cc001;
-    @ApiModelProperty("gcfm货单号")
+    @ApiModelProperty("到货单号")
     private String cc002;
     @ApiModelProperty("进货单别，默认3401")
     private String tg001="3401";

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

@@ -24,7 +24,7 @@ public class PurthCreateParams {
     private String cd003;
     @ApiModelProperty("仓库")
     private String th009 = "";
-    @ApiModelProperty("原币单位金价")
+    @ApiModelProperty("批号")
     private String th010 = "";
     @ApiModelProperty("验收数量，默认进货数-入库数")
     private BigDecimal th015 = BigDecimal.ZERO;

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

@@ -36,10 +36,10 @@ public class SfctbCreateParams {
     private Integer tc020;
     @ApiModelProperty("使用机时")
     private Integer tc021;
-    @ApiModelProperty("")
+    @ApiModelProperty("批号")
     private String tc032;
     @ApiModelProperty("转移数量")
     private BigDecimal tc036;
-    @ApiModelProperty("")
+    @ApiModelProperty("库位")
     private String tc056;
 }

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

@@ -81,6 +81,8 @@ public class Moctg extends EntityBase {
     private String tg015;
     @ApiModelProperty("检验状态")
     private String tg016="0";
+    @ApiModelProperty("批号")
+    private String tg017;
     @ApiModelProperty("急料")
     private String tg024;
     /**
@@ -96,5 +98,7 @@ public class Moctg extends EntityBase {
     private BigDecimal tg032;
     @ApiModelProperty("验收数量")
     private BigDecimal tg013;
+    @ApiModelProperty("批号说明")
+    private String tg031;
 
 }

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

@@ -2,6 +2,7 @@ package com.topsunit.scanservice.ximai.security;
 
 import com.topsunit.scanservice.ximai.common.AppConfig;
 import com.topsunit.scanservice.ximai.common.Constants;
+import com.topsunit.scanservice.ximai.common.TopsunitException;
 import com.topsunit.scanservice.ximai.dto.LoginResult;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -52,6 +53,7 @@ public class TokenService
             }
             catch (Exception e)
             {
+                throw new TopsunitException(e);
             }
         }
         return null;
@@ -128,7 +130,7 @@ public class TokenService
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                throw new TopsunitException(e);
             }
         }
         return null;

src/main/resources/application-dev.yml

@@ -7,6 +7,26 @@ topsunit:
   mes-url: http://localhost:8088
   default-password: 123456
   db-name: TEST
+  print:
+    urls:
+      - code: 1
+        url: http://192.168.1.24:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 2
+        url: http://192.168.4.198:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 3
+        url: http://192.168.2.198:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 4
+        url: http://192.168.3.198:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 5
+        url: http://192.168.1.25:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 6
+        url: http://192.168.1.26:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 7
+        url: http://192.168.2.197:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 8
+        url: http://192.168.3.197:8085/ximaiprintservice/print/PrintLabelByBarTender
+      - code: 9
+        url: http://192.168.4.197:8085/ximaiprintservice/print/PrintLabelByBarTender
 server:
   port: 20091
   servlet:

src/main/resources/application-thximai.yml

@@ -6,7 +6,7 @@ topsunit:
   share-url: smb://127.0.0.1/share
   mes-url: http://localhost:8088
   default-password: 123456
-  db-name: Leader
+  db-name: DEMO
   print:
     urls:
       - code: 1
@@ -50,10 +50,10 @@ spring:
       - classpath:/static/
       - classpath:/public/
   datasource:
-    name: Leader
+    name: DEMO
     username: sa
     password: 123qweQWE
-    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=Leader
+    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=DEMO
     type:  com.alibaba.druid.pool.DruidDataSource
     druid:
       filters: stat