|
|
cdb47fde3f
|
merge: integrate latest main into FT546MWS algorithm test
|
2026-08-11 15:00:21 +08:00 |
|
local
|
916ac6bda3
|
本地最新代码:同步所有修改及新增模块
|
2026-08-11 13:34:15 +08:00 |
|
|
|
8b84459072
|
fix: decouple manual tidy from vehicle assignment
|
2026-07-24 11:38:21 +08:00 |
|
|
|
89a26e6d42
|
fix: align WCS vehicle snapshot method
|
2026-07-24 10:04:25 +08:00 |
|
|
|
d6179297ab
|
chore: restore local WMS version
|
2026-07-24 08:56:02 +08:00 |
|
|
|
bb682623db
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
# ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
# ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
# ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
# ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
# ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
# ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
# ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
# ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/IOutStockoutService.java
# ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
# ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
# ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
# ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
# ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
# ruoyi-admin/src/main/resources/application-druid.yml
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
# ruoyi-admin/src/main/resources/mapper/bas/AgvPointMapper.xml
# ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
# ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
# ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
# ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
# ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
# ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
# ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
# ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
# ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
# ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
# ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
# ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
# ruoyi-ui/src/views/bas/traycode/index.vue
# ruoyi-ui/src/views/in/stockIn/index.vue
# ruoyi-ui/src/views/out/outStockoutManage.vue
# ruoyi-ui/src/views/stock/management/index.vue
|
2026-07-24 08:52:44 +08:00 |
|
|
|
98db537218
|
chore: upload current WMS changes
|
2026-07-24 08:51:42 +08:00 |
|
|
|
41e412f214
|
refactor: remove WCS tidy task-state recovery
|
2026-07-23 15:55:43 +08:00 |
|
|
|
7b63e7863f
|
fix: make tidy workflow state updates idempotent
|
2026-07-23 15:42:59 +08:00 |
|
|
|
303beb5d42
|
fix: honor tidy recovery row counts
|
2026-07-23 15:36:00 +08:00 |
|
|
|
3ea7216fdb
|
feat: recover tidy workflows from WMS evidence
|
2026-07-23 15:30:18 +08:00 |
|
|
|
a545986409
|
feat: project local tidy recovery evidence
|
2026-07-23 15:15:57 +08:00 |
|
1009473166@qq.com
|
b32da3e05f
|
20206.5.26 早8;52
修改扫描二维码获取单据数据
修后台将二维码传到后台字段变更为barCode
|
2026-05-26 09:54:34 +08:00 |
|
1009473166@qq.com
|
49ddd8fd21
|
20206.5.26 早8;52
修改扫描二维码获取单据数据
修后台将二维码传到后台字段变更为barCode
|
2026-05-26 08:53:09 +08:00 |
|
1009473166@qq.com
|
368d615674
|
2026.4.30 早 10:13
入库回传接口/出库回传接口 参数传递仓库 stg_location 修改
|
2026-04-30 10:14:07 +08:00 |
|
1009473166@qq.com
|
eba8434f68
|
2026.4.30 早 10:07
更新接收出库单拆单立库/平库单据
|
2026-04-30 10:07:38 +08:00 |
|
1009473166@qq.com
|
7984ccc7f1
|
2026.4.29 午 14:16
平库出库子单单据库存校验
等待最后测试，以及单据仓库区分字段
|
2026-04-29 14:17:00 +08:00 |
|
1009473166@qq.com
|
95656dccc4
|
2026.4.28 午 17:30
平库出库主单查询
平库出库子单查询
平库出库子单单据库存校验
|
2026-04-28 17:29:22 +08:00 |
|
1009473166@qq.com
|
6851a898ca
|
2026.4.28 午 14:50
平库出库确认
|
2026-04-28 14:50:39 +08:00 |
|
1009473166@qq.com
|
411e3a2c4f
|
2026.4.28 午 14:04
立库出库信息查询校验
|
2026-04-28 14:05:42 +08:00 |
|
1009473166@qq.com
|
aad8c71466
|
2026.4.28 午 14:04
立库出库信息查询校验
|
2026-04-28 14:04:34 +08:00 |
|
1009473166@qq.com
|
6ce9f469e0
|
2026.4.27
大更新
|
2026-04-27 16:02:27 +08:00 |
|
1009473166@qq.com
|
52ce9135da
|
2026.3.19 晚
缓存出库确认后台
|
2026-04-27 15:58:34 +08:00 |
|
1009473166@qq.com
|
3729d0df5f
|
2026.4.13 早
接口回传，以及接口接收直接审核，回传表修改
|
2026-04-13 09:57:34 +08:00 |
|
1009473166@qq.com
|
fa00020c38
|
Merge remote-tracking branch 'origin/main'
|
2026-03-23 09:54:20 +08:00 |
|
1009473166@qq.com
|
c9cd7c772e
|
2026.3.19 晚
缓存出库确认后台
|
2026-03-23 09:54:14 +08:00 |
|
张怡蓉
|
eb26dc9a65
|
入库部分和接口
|
2026-03-23 09:52:06 +08:00 |
|
1009473166@qq.com
|
10fa4b3b15
|
2026.3.19 晚
缓存出库确认后台
|
2026-03-19 18:33:27 +08:00 |
|
1009473166@qq.com
|
f25bb2a549
|
Merge remote-tracking branch 'origin/main'
|
2026-03-19 15:44:02 +08:00 |
|
张怡蓉
|
d9da0de59e
|
入库部分和接口
|
2026-03-19 09:05:42 +08:00 |
|
1009473166@qq.com
|
e65b5933ad
|
2026.3.18 晚
|
2026-03-18 20:28:14 +08:00 |
|
liuhanqing
|
76517dc3a5
|
现场修改
|
2026-03-11 10:06:28 +08:00 |
|
liuhanqing
|
969949adf4
|
现场修改
|
2026-03-11 09:01:51 +08:00 |
|
liuhanqing
|
4384eb5b7a
|
现场调度修改
|
2026-03-11 08:55:44 +08:00 |
|
猫猫guowen
|
d652a29bba
|
库存平面图
|
2026-03-06 13:21:52 +08:00 |
|
liuhanqing
|
1ad5a15b6f
|
现场调度修改
|
2026-03-05 15:08:32 +08:00 |
|
张怡蓉
|
38f10b676d
|
入库部分和接口
|
2026-03-05 14:20:39 +08:00 |
|
张怡蓉
|
83db499c85
|
入库部分和接口
|
2026-03-02 11:41:34 +08:00 |
|
liuhanqing
|
a33998553e
|
现场调度修改
|
2026-02-26 09:55:15 +08:00 |
|
张怡蓉
|
88d4caa017
|
入库部分和接口
|
2026-02-24 10:17:20 +08:00 |
|
zj
|
682765107d
|
WCS请求入库，分配货位
|
2026-02-02 15:26:40 +08:00 |
|
ysj09
|
6d2d0f3068
|
2.2优化
|
2026-02-02 09:34:51 +08:00 |
|
张怡蓉
|
dfbe04cedb
|
入库部分和接口
|
2026-01-29 10:43:56 +08:00 |
|
猫猫guowen
|
f3c02e3eb2
|
库存信息、库存平面图样式
|
2026-01-28 14:11:46 +08:00 |
|
张怡蓉
|
0ffe411dba
|
入库部分和接口
|
2026-01-27 17:31:05 +08:00 |
|
张怡蓉
|
407b1f08b5
|
入库部分和接口
|
2026-01-27 14:17:05 +08:00 |
|
猫猫guowen
|
4aaf5b9a1e
|
库存管理
|
2026-01-13 17:39:49 +08:00 |
|
猫猫guowen
|
dfd355e842
|
Merge remote-tracking branch 'origin/main'
|
2026-01-12 17:20:36 +08:00 |
|
猫猫guowen
|
d34c494aca
|
查询统计
|
2026-01-12 17:12:32 +08:00 |
|
1009473166@qq.com
|
a01b08c098
|
test
|
2026-01-12 09:08:44 +08:00 |
|
