修改wms为storage
This commit is contained in:
dimengzhe
30
target/classes/application-dev.yml
Normal file
30
target/classes/application-dev.yml
Normal file
@@ -0,0 +1,30 @@
|
||||
spring:
|
||||
datasource:
|
||||
hikari:
|
||||
max-lifetime: 500000
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://39.104.100.138:3306/yxt_wms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
|
||||
username: root
|
||||
password: yxt_mysql_138
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 127.0.0.1:8848
|
||||
redis:
|
||||
database: 3 # Redis数据库索引（默认为0）
|
||||
host: 127.0.0.1
|
||||
jedis:
|
||||
pool:
|
||||
max-active: -1 #连接池最大连接数（使用负值表示没有限制）
|
||||
max-idle: 8 #连接池中的最大空闲连接
|
||||
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
|
||||
min-idle: 0 # 连接池中的最小空闲连接
|
||||
password: 123456
|
||||
port: 6379
|
||||
timeout: 0 # 连接超时时间（毫秒）
|
||||
|
||||
image:
|
||||
upload:
|
||||
path: D:/works/projects/yxt/yxtgit/lipinka/yxt-yythmall-biz/target/classes/static/upload/
|
||||
url:
|
||||
prefix: http://192.168.2.111:7211/upload/
|
||||
0
target/classes/application-pro.yml
Normal file
0
target/classes/application-pro.yml
Normal file
0
target/classes/application-test.yml
Normal file
0
target/classes/application-test.yml
Normal file
43
target/classes/application.yml
Normal file
43
target/classes/application.yml
Normal file
@@ -0,0 +1,43 @@
|
||||
spring:
|
||||
application:
|
||||
name: ss-storage
|
||||
profiles:
|
||||
active: dev
|
||||
messages:
|
||||
# 国际化资源文件路径
|
||||
basename: i18n/messages
|
||||
servlet:
|
||||
#上传文件
|
||||
multipart:
|
||||
max-file-size: 50MB
|
||||
max-request-size: 100MB
|
||||
devtools:
|
||||
restart:
|
||||
# 热部署开关
|
||||
enabled: true
|
||||
|
||||
server:
|
||||
port: 7301
|
||||
max-http-header-size: 102400
|
||||
undertow:
|
||||
max-http-post-size: -1
|
||||
|
||||
#mybatis
|
||||
mybatis-plus:
|
||||
# 配置mapper的扫描，找到所有的mapper.xml映射文件
|
||||
mapper-locations: classpath*:**Mapper.xml
|
||||
global-config:
|
||||
refresh: true
|
||||
db-config:
|
||||
#定义生成ID的类型
|
||||
id-type: Auto
|
||||
db-type: mysql
|
||||
configuration:
|
||||
map-underscore-to-camel-case: false
|
||||
cache-enabled: true
|
||||
call-setters-on-nulls: true
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageansbill.StorageAnsBillMapper">
|
||||
<select id="listPage" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailVo">
|
||||
select wd.goodsSkuSid, wd.goodsSpuName, wd.goodsSkuCode, wd.goodsSkuTitle, wd.goodSpuSid
|
||||
from storage_ans_bill_detail wd
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="listPages" resultType="com.yxt.storage.biz.storageansbill.StorageAnsBillVo">
|
||||
select wab.sid,
|
||||
wab.billNo,
|
||||
DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime,
|
||||
wab.createByName,
|
||||
wab.sourceBillNo,
|
||||
wab.busTypeValue,
|
||||
wab.supplierName,
|
||||
wab.contact,
|
||||
wab.mobile,
|
||||
DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
|
||||
wab.billState,
|
||||
wab.reviewStatus,
|
||||
wab.refuseReason
|
||||
from storage_ans_bill wab
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
order by wab.id desc
|
||||
</select>
|
||||
|
||||
<select id="details" resultType="com.yxt.storage.biz.storageansbill.StorageAnsDetailsVo">
|
||||
select wab.billNo,
|
||||
wab.createByName,
|
||||
DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime,
|
||||
wab.sourceBillNo,
|
||||
wab.busTypeKey,
|
||||
wab.busTypeValue,
|
||||
wab.supplierSid,
|
||||
wab.supplierName,
|
||||
DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
|
||||
wab.billState,
|
||||
wab.reviewStatus
|
||||
from storage_ans_bill wab
|
||||
where sid = #{sid}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageansbilldetail.StorageAnsBillDetailMapper">
|
||||
<delete id="deleteDetails">
|
||||
delete
|
||||
from storage_ans_bill_detail
|
||||
where billSid = #{sid}
|
||||
</delete>
|
||||
|
||||
<select id="selectByBillSid" resultType="com.yxt.storage.biz.storageansbilldetail.StorageAnsListDetailsVo">
|
||||
select wd.goodsSkuTitle,
|
||||
wd.goodsSkuCode,
|
||||
wd.goodsSkuOwnSpec,
|
||||
wd.unit,
|
||||
wd.orderCount,
|
||||
wd.waitInCount,
|
||||
wd.actualInCount,
|
||||
wd.cost,
|
||||
wd.taxAmount,
|
||||
wd.taxPrice,
|
||||
wd.amount
|
||||
from storage_ans_bill_detail wd
|
||||
where billSid = #{sid}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storagedistributebill.StorageDistributeBillMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageinventory.StorageInventoryMapper">
|
||||
<!-- <where> ${ew.sqlSegment} </where>-->
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="listPage" resultType="com.yxt.storage.biz.storageinventory.StorageInventoryVo">
|
||||
select a.goodsID,
|
||||
a.sid,
|
||||
a.goodsSpuName,
|
||||
a.goodsSkuCode,
|
||||
a.goodsSkuOwnSpec,
|
||||
a.unit,
|
||||
a.warehouseName,
|
||||
a.warehouseRackCode,
|
||||
a.count,
|
||||
a.allocateCount,
|
||||
a.batchNumber,
|
||||
DATE_FORMAT(a.firstInDate, '%Y-%m-%d') as firstInDate
|
||||
from wms_inventory a
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordMapper">
|
||||
<select id="getStorageInventoryRecordList" resultType="com.yxt.storage.biz.storageinventoryrecord.StorageInventoryRecordListVo">
|
||||
select wir.billNo,
|
||||
case wir.billType when 1 then '入库' when 0 then '出库' end as billType,
|
||||
DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
|
||||
wir.busTypeValue,
|
||||
wir.billObjName,
|
||||
wir.count,
|
||||
wir.currentCount
|
||||
from storage_inventory_record wir
|
||||
where wir.inventorySid = #{sid}
|
||||
order by wir.createTime desc
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageoutbill.StorageOutBillMapper">
|
||||
</mapper>
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillMapper">
|
||||
<select id="listPage" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillPageVo">
|
||||
select wrb.sid,
|
||||
wrb.billNo,
|
||||
wrb.createByName,
|
||||
wrb.sourceBillNo,
|
||||
wrb.busTypeValue,
|
||||
wrb.supplierName,
|
||||
DATE_FORMAT(wrb.createTime, '%Y-%m-%d') as createTime,
|
||||
DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate,
|
||||
wrb.billState
|
||||
from wms_receipt_bill wrb
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
order by wrb.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbill.StorageReceiptBillInitVo">
|
||||
select wrb.sid,
|
||||
wrb.billNo,
|
||||
wrb.sourceBillSid,
|
||||
wrb.sourceBillNo,
|
||||
wrb.createBySid,
|
||||
wrb.createByName,
|
||||
wrb.busTypeKey,
|
||||
wrb.busTypeValue,
|
||||
wrb.supplierSid,
|
||||
wrb.supplierName,
|
||||
DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate,
|
||||
case wrb.billState
|
||||
when '0' then '新建'
|
||||
when '1' then '已完成' end as billState,
|
||||
wrb.remarks,
|
||||
wrb.useOrgSid,
|
||||
wrb.createOrgSid
|
||||
from wms_receipt_bill wrb
|
||||
where wrb.sid = #{sid}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailMapper">
|
||||
<delete id="deleteByBillSid">
|
||||
delete
|
||||
from wms_receipt_bill_detail
|
||||
where billSid = #{sid}
|
||||
</delete>
|
||||
|
||||
<select id="getDetailsInit" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetailDto2">
|
||||
select wrbd.goodsSkuSid,
|
||||
wrbd.goodsSkuTitle,
|
||||
wrbd.goodsSkuCode,
|
||||
wrbd.goodsSkuOwnSpec,
|
||||
wrbd.unit,
|
||||
wrbd.warehouseSid,
|
||||
wrbd.warehouseName,
|
||||
wrbd.warehouseRackSid,
|
||||
wrbd.warehouseRackName,
|
||||
wrbd.actualInCount,
|
||||
wrbd.rejectCount,
|
||||
wrbd.rejectReason,
|
||||
wrbd.isQuality,
|
||||
wrbd.qualityState,
|
||||
wrbd.packageRemark,
|
||||
wrbd.state,
|
||||
wrbd.sid detailsSid
|
||||
from wms_receipt_bill_detail wrbd
|
||||
where billSid = #{sid}
|
||||
</select>
|
||||
|
||||
<select id="selectByBillSid" resultType="com.yxt.storage.biz.storagereceiptbilldetail.StorageReceiptBillDetail">
|
||||
select *
|
||||
from wms_receipt_bill_detail where billSid = #{sid}
|
||||
<if test="sidList != null and sidList.size() != 0">
|
||||
and sid not in
|
||||
<foreach collection="sidList" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchMapper">
|
||||
<delete id="deleteByDetails">
|
||||
delete
|
||||
from wms_receipt_bill_detail_batch
|
||||
where billSid = #{sid}
|
||||
</delete>
|
||||
|
||||
<select id="getDetailsInit"
|
||||
resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatchDto2">
|
||||
select wb.batchNumber,
|
||||
DATE_FORMAT(wb.manufactureDate, '%Y-%m-%d') as manufactureDate,
|
||||
DATE_FORMAT(wb.expirationDate, '%Y-%m-%d') as expirationDate,
|
||||
wb.batchCount
|
||||
from wms_receipt_bill_detail_batch wb
|
||||
where wb.billSid = #{sid}
|
||||
and wb.detailSid = #{detailsSid}
|
||||
</select>
|
||||
|
||||
<select id="selectByDetails"
|
||||
resultType="com.yxt.storage.biz.storagereceiptbilldetailbatch.StorageReceiptBillDetailBatch">
|
||||
select *
|
||||
from wms_receipt_bill_detail_batch
|
||||
where detailSid = #{sid}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageshelfbill.StorageShelfBillMapper">
|
||||
<select id="listPage" resultType="com.yxt.storage.biz.storageshelfbill.StorageShelfBillVo">
|
||||
select wsb.sid,
|
||||
wsb.billNo,
|
||||
DATE_FORMAT(wsb.createTime, '%Y-%m-%d') as createTime,
|
||||
wsb.createByName,
|
||||
wsb.sourceBillNo,
|
||||
case wsb.billState
|
||||
when 0 then '新建'
|
||||
when 1 then '已完成' end as billState
|
||||
from wms_shelf_bill wsb
|
||||
<where>
|
||||
${ew.sqlSegment}
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="details" resultType="com.yxt.storage.biz.storageshelfbill.ShelfDetailsVo">
|
||||
select wsb.sid,
|
||||
wsb.billNo,
|
||||
wsb.createBySid,
|
||||
wsb.createByName,
|
||||
DATE_FORMAT(wsb.createTime, '%Y-%m-%d') as createTime,
|
||||
wsb.sourceBillNo,
|
||||
wsb.sourceBillSid,
|
||||
wsb.billState
|
||||
from wms_shelf_bill wsb
|
||||
where sid = #{sid}
|
||||
</select>
|
||||
|
||||
<select id="selectNum" resultType="java.lang.String">
|
||||
select RIGHT(goodsID, 4)
|
||||
from wms_inventory
|
||||
where goodsID LIKE concat(#{bill}, '%')
|
||||
order by id desc
|
||||
limit 1
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,46 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailMapper">
|
||||
<delete id="deleteByMainSid">
|
||||
delete
|
||||
from wms_shelf_bill_detail
|
||||
where billSid = #{sid}
|
||||
</delete>
|
||||
|
||||
<select id="details" resultType="com.yxt.storage.biz.storageshelfbilldetail.ShelfDetailsListVo">
|
||||
select wsd.batchNumber,
|
||||
wsd.inventorySid,
|
||||
wsd.warehouseSid,
|
||||
wsd.warehouseRackCode,
|
||||
wsd.warehouseRackSid,
|
||||
wsd.count
|
||||
from wms_shelf_bill_detail wsd
|
||||
where billSid = #{sid}
|
||||
</select>
|
||||
|
||||
<select id="selectByBillSid" resultType="com.yxt.storage.biz.storageshelfbilldetail.StorageShelfBillDetailVos">
|
||||
select wrbd.goodSpuSid,
|
||||
wrbd.goodsSpuName,
|
||||
wrbd.goodsSkuSid,
|
||||
wrbd.goodsSkuTitle,
|
||||
wrbd.goodsSkuCode,
|
||||
wrbd.goodsSkuOwnSpec,
|
||||
wrbd.unit,
|
||||
wsbd.actualCount count,
|
||||
wrbd.warehouseSid,
|
||||
wrbd.warehouseName,
|
||||
wrbd.warehouseRackSid,
|
||||
wsbd.warehouseRackCode,
|
||||
wsbd.batchNumber,
|
||||
wsbd.inventorySid,
|
||||
wsbd.sid detailsSid
|
||||
from wms_shelf_bill_detail wsbd
|
||||
left join wms_receipt_bill_detail wrbd on wrbd.sid = wsbd.receiptDetailSid
|
||||
where wsbd.billSid = #{sid}
|
||||
</select>
|
||||
|
||||
<select id="selectReceiptSidList" resultType="java.lang.String">
|
||||
select receiptDetailSid
|
||||
from wms_shelf_bill_detail
|
||||
</select>
|
||||
</mapper>
|
||||
54
target/classes/logback-spring.xml
Normal file
54
target/classes/logback-spring.xml
Normal file
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
|
||||
<property name="log.base" value="logs/yxt_storage"/>
|
||||
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 ：
|
||||
|%blue(%thread) 线程 如 ：DiscoveryClient-CacheRefreshExecutor-0-->
|
||||
<!--<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
|
||||
<pattern>%yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n)
|
||||
</pattern>
|
||||
<!--<charset>UTF-8</charset> -->
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- 彩色日志 -->
|
||||
<!-- 彩色日志依赖的渲染类 -->
|
||||
<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"/>
|
||||
<!-- 彩色日志格式 -->
|
||||
<property name="CONSOLE_LOG_PATTERN"
|
||||
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
|
||||
|
||||
<appender name="FILEOUT"
|
||||
class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.base}.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${log.base}.%d{yyyyMMdd}.%i.log.zip
|
||||
</fileNamePattern>
|
||||
<!-- 当文件大小超过10MB时触发滚动 -->
|
||||
<timeBasedFileNamingAndTriggeringPolicy
|
||||
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>1MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<!--<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>-->
|
||||
<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}
|
||||
-%msg%n
|
||||
</Pattern>
|
||||
<!--<charset>UTF-8</charset> -->
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="DEBUG">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<appender-ref ref="FILEOUT"/>
|
||||
</root>
|
||||
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user