Compare commits

..

2 Commits

Author SHA1 Message Date
4b57ce78a1 更新 2025-09-22 12:12:51 +08:00
52fe438544 更新 2025-09-22 11:08:50 +08:00
7 changed files with 27 additions and 39 deletions

View File

10
pom.xml
View File

@@ -4,21 +4,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>sxt-modules</artifactId>
<groupId>com.yxt</groupId> <groupId>com.yxt</groupId>
<artifactId>yxt-parent</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
<relativePath/>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ss-common-purchase</artifactId> <artifactId>sxt-modules-purchase</artifactId>
<groupId>ss-common-purchase</groupId> <version>0.0.1</version>
<version>2.0.1</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.yxt</groupId> <groupId>com.yxt</groupId>
<artifactId>yxt-common-base</artifactId> <artifactId>sxt-common-base</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
</dependency> </dependency>

View File

@@ -35,6 +35,6 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/apiadmin/purchaseappendix") @RequestMapping("/apiadmin/purchaseappendix")
public class PurchaseAppendixRest { public class PurchaseAppendixRest {
@Autowired @Autowired
private PurchaseAppendixService purchaseAppendixService; private PurchaseAppendixService purchaseAppendixService;
} }

View File

@@ -39,31 +39,31 @@ public class PurchasebackDetailDto implements Dto {
private String sid; // sid private String sid; // sid
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("单据sid") @ApiModelProperty("单据sid")
private String billSid; // 单据sid private String billSid; // 单据sid
@ApiModelProperty("商品基础信息Sid") @ApiModelProperty("商品基础信息Sid")
private String goodsSpuSid; // 商品基础信息Sid private String goodsSpuSid; // 商品基础信息Sid
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsSpuName; // 商品名称 private String goodsSpuName; // 商品名称
@ApiModelProperty("商品Skusid") @ApiModelProperty("商品Skusid")
private String goodsSkuSid; // 商品Skusid private String goodsSkuSid; // 商品Skusid
@ApiModelProperty("商品Sku名称") @ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称 private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("商品编码(图号)") @ApiModelProperty("商品编码(图号)")
private String goodsSkuCode; // 商品编码(图号) private String goodsSkuCode; // 商品编码(图号)
@ApiModelProperty("规格") @ApiModelProperty("规格")
private String goodsSkuOwnSpec; // 规格 private String goodsSkuOwnSpec; // 规格
@ApiModelProperty("计量单位") @ApiModelProperty("计量单位")
private String unit; // 计量单位 private String unit; // 计量单位
@ApiModelProperty("仓库sid") @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称 private String warehouseName; // 仓库名称
@ApiModelProperty("已退数量") @ApiModelProperty("已退数量")
private BigDecimal returnedCount; // 已退数量 private BigDecimal returnedCount; // 已退数量
@ApiModelProperty("退货数量") @ApiModelProperty("退货数量")
private BigDecimal backCount; // 退货数量 private BigDecimal backCount; // 退货数量
@ApiModelProperty("采购数量") @ApiModelProperty("采购数量")

View File

@@ -3,27 +3,23 @@ spring:
hikari: hikari:
max-lifetime: 500000 max-lifetime: 500000
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://39.104.100.138:3306/ss_purchase?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true url: jdbc:mysql://101.200.164.102:3306/ss_purchase?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
# url: jdbc:mysql://8.130.39.13:3306/yxt_lpk_yythmall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
username: root username: root
# password: 1LAiGz$t1*Iw password: Yxt@67508182
password: yxt_mysql_138
cloud: cloud:
nacos: nacos:
discovery: discovery:
namespace: common server-addr: 127.0.0.1:8848
server-addr: 39.104.100.138:8848
register-enabled: false
redis: redis:
database: 3 # Redis数据库索引默认为0 database: 3 # Redis数据库索引默认为0
host: 39.104.100.138 host: 127.0.0.1
jedis: jedis:
pool: pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制) max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接 max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接 min-idle: 0 # 连接池中的最小空闲连接
password: password: 123456
port: 6379 port: 6379
timeout: 0 # 连接超时时间(毫秒) timeout: 0 # 连接超时时间(毫秒)

View File

@@ -1,6 +1,6 @@
spring: spring:
application: application:
name: ss-common-purchase name: sxt-common-purchase
profiles: profiles:
active: dev active: dev
# active: test # active: test
@@ -19,7 +19,7 @@ spring:
enabled: true enabled: true
server: server:
port: 6215 port: 10009
max-http-header-size: 102400 max-http-header-size: 102400
undertow: undertow:
max-http-post-size: -1 max-http-post-size: -1
@@ -40,11 +40,5 @@ mybatis-plus:
call-setters-on-nulls: true call-setters-on-nulls: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#rocketmq:
# producer:
# group: yxt-supervise-gf
# name-server: 127.0.0.1:9876

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<property name="log.base" value="logs/yxt_yyth" /> <property name="log.base" value="logs/yxt-purchase" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>