|
|
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 |
|
|
|
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 |
|
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
|
c9cd7c772e
|
2026.3.19 晚
缓存出库确认后台
|
2026-03-23 09:54:14 +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
|
4384eb5b7a
|
现场调度修改
|
2026-03-11 08:55:44 +08:00 |
|
liuhanqing
|
1ad5a15b6f
|
现场调度修改
|
2026-03-05 15:08:32 +08:00 |
|
张怡蓉
|
88d4caa017
|
入库部分和接口
|
2026-02-24 10:17:20 +08:00 |
|
|
|
2b86d14f56
|
修改页面
|
2026-02-02 16:07:00 +08:00 |
|
ysj09
|
6d2d0f3068
|
2.2优化
|
2026-02-02 09:34:51 +08:00 |
|
张怡蓉
|
dfbe04cedb
|
入库部分和接口
|
2026-01-29 10:43:56 +08:00 |
|
猫猫guowen
|
b73a93c317
|
库存平面图
|
2026-01-28 15:02:39 +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
|
d34c494aca
|
查询统计
|
2026-01-12 17:12:32 +08:00 |
|
猫猫guowen
|
45c216f684
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
# ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
|
2026-01-09 17:10:30 +08:00 |
|
猫猫guowen
|
572c27be13
|
查询统计
|
2026-01-09 17:08:24 +08:00 |
|
liuhanqing
|
e14aac2fc3
|
盘点管理页面 页面字段修改
|
2026-01-07 15:37:03 +08:00 |
|
liuhanqing
|
2c6f0fea94
|
出库管理页面字段修改
|
2026-01-07 11:43:29 +08:00 |
|
liuhanqing
|
a71caaef81
|
出库管理页面字段修改
|
2026-01-07 10:08:57 +08:00 |
|
张怡蓉
|
3b8dbc90d0
|
入库部分和接口
|
2026-01-07 09:31:55 +08:00 |
|
张怡蓉
|
9ffd5c01a3
|
入库部分和接口
|
2026-01-05 16:09:50 +08:00 |
|
张怡蓉
|
f5f4d1007a
|
入库部分和接口
|
2025-12-30 09:28:36 +08:00 |
|
猫猫guowen
|
dc8f2d329a
|
KPI
|
2025-12-29 16:35:26 +08:00 |
|
猫猫guowen
|
bec185c139
|
数字孪生后台
|
2025-12-24 13:06:45 +08:00 |
|
张怡蓉
|
d427ebf6d0
|
初始化
|
2025-12-23 13:36:18 +08:00 |
|
