zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场调度修改

Browse Source
This commit is contained in:
liuhanqing
2026-03-05 15:08:32 +08:00
parent 38f10b676d
commit 1ad5a15b6f
20 changed files with 100 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,14 +6,14 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:sqlserver://172.16.4.141:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
username: sa
password: Flrd0914.
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url: jdbc:mariadb://172.16.4.141:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mariadb://172.16.4.12:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Flrd0914.
# 初始连接数

6
ruoyi-admin/src/main/resources/application.yml
View File

@@ -66,12 +66,12 @@ spring:
devtools:
restart:
# 热部署开关
enabled: true
enabled: false
data:
# redis 配置
redis:
# 地址
host: 172.16.4.141
host: 192.168.188.236
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -133,7 +133,7 @@ token:
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
expireTime: 720

6
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -205,6 +205,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where job_id = #{jobId}
</update>
<update id="ykCompleted">
{call proc_yk_complete(
#{v_job_id,jdbcType=VARCHAR,mode=IN},
#{v_result,mode=OUT,jdbcType=INTEGER}
)}
</update>
<delete id="deleteMydoJobByJobId" parameterType="String">
delete from mydo_job where job_id = #{jobId}

5
ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
View File

@@ -253,9 +253,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date,
d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
p.product_name
d.erp_stockout_id, d.unit, d.spec,
d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id
where stockout_guid = #{stockoutGuid}
</select>

6
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
{
call proc_out_auto_allocation(
call proc_out_auto_allocation_copy1(
#{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=VARCHAR},
#{v_resultString,mode=OUT,jdbcType=VARCHAR}
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)
}
</select>
@@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
#{v_stock_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=VARCHAR},
#{v_resultString,mode=OUT,jdbcType=VARCHAR}
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)
}
</select>