lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改位置生成任务数量

Browse Source
This commit is contained in:
liuhanqing
2026-02-11 10:38:10 +08:00
parent 999c2bdc54
commit 3c87705b97
5 changed files with 2609 additions and 2606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -291,8 +291,8 @@ public class PdaServiceImp implements PdaService {
* @param mydoJob * @param mydoJob
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
private AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) { public AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId()); BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId());
//修改拣选数量 //修改拣选数量
for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
@@ -348,7 +348,8 @@ public class PdaServiceImp implements PdaService {
* @param mydoJob * @param mydoJob
* @return * @return
*/ */
private AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) { @Transactional(rollbackFor = Exception.class)
public AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId()); BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId());
@@ -482,6 +483,7 @@ public class PdaServiceImp implements PdaService {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId()));
//执行【盘点确认出库】过程 //执行【盘点确认出库】过程
pdaMapper.checkMakeSure(map); pdaMapper.checkMakeSure(map);

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

@@ -6,7 +6,7 @@ spring:
druid: druid:
#主数据信息 #主数据信息
master: master:
url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT501; url: jdbc:sqlserver://172.16.4.12:1433;databaseName=FT501;
username: sa username: sa
password: Flrd0914. password: Flrd0914.
# 从库数据源 # 从库数据源

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

@@ -68,7 +68,7 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 172.16.2.170 host: 127.0.0.1
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引

1
ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
View File

@@ -73,6 +73,7 @@
<select id="checkMakeSure" parameterType="java.util.Map" statementType="CALLABLE"> <select id="checkMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_check_makesure( {call proc_check_makesure(
#{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_tray_code,mode=IN,jdbcType=VARCHAR},
#{v_entrance_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=INTEGER}, #{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR} #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)} )}

5202
ruoyi-ui/src/lang/en.js
View File

File diff suppressed because it is too large Load Diff