Commits · 0524eeda6022a19a37bba7564c94a91eb02427e1 · 周海峰 / mini-wms

12 Dec, 2025 21 commits
- 修bug · 0524eeda
  yubin committed Dec 12, 2025
  
  0524eeda Browse Files
- 修bug · e1ae0b7c
  yubin committed Dec 12, 2025
  
  e1ae0b7c Browse Files
- 修bug · bb7e8f6e
  yubin committed Dec 12, 2025
  
  bb7e8f6e Browse Files
- 修bug · 3da1d959
  yubin committed Dec 12, 2025
  
  3da1d959 Browse Files
- Merge remote-tracking branch 'origin/master' · 46b00658
  yubin committed Dec 12, 2025
  
  46b00658 Browse Files
- 修bug · bdc9f912
  yubin committed Dec 12, 2025
  
  bdc9f912 Browse Files
- 页面新增已提交入库单无法修改弹窗 · f6478b44
  zhangtw committed Dec 12, 2025
  
  f6478b44 Browse Files
- Merge remote-tracking branch 'origin/master' · 379826e3
  yubin committed Dec 12, 2025
  
  379826e3 Browse Files
- 修bug · 9ff0da59
  yubin committed Dec 12, 2025
  
  9ff0da59 Browse Files
- 查询表格显示字段调整 · 6db289be
  wangchunyang committed Dec 12, 2025
  
  6db289be Browse Files
- Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms · c2162be0
  wangchunyang committed Dec 12, 2025
  
  c2162be0 Browse Files
- 修bug · 9e20d976
  yubin committed Dec 12, 2025
  
  9e20d976 Browse Files
- Merge remote-tracking branch 'origin/master' · 3f752650
```
# Conflicts:
#	ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/Inventory.java
```
  yubin committed Dec 12, 2025
  3f752650 Browse Files
- Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms · b1240733
  wangchunyang committed Dec 12, 2025
  
  b1240733 Browse Files
- 修bug · 118fc04a
  yubin committed Dec 12, 2025
  
  118fc04a Browse Files
- bug · 3341c88b
  zhangtw committed Dec 12, 2025
  
  3341c88b Browse Files
- Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms · 4d6ba55f
  wangchunyang committed Dec 12, 2025
  
  4d6ba55f Browse Files
- 导入组件新增入库出库类型单选框 · 14445f3b
```
完善入库页面字段映射
入库后端字段映射
```
  zhangtw committed Dec 12, 2025
  14445f3b Browse Files
- Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms · 696c8784
  wangchunyang committed Dec 12, 2025
  
  696c8784 Browse Files
- Merge remote-tracking branch 'origin/master' · b9c85d55
```
# Conflicts:
#	ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/Inventory.java
#	ruoyi-inventory/src/main/java/com/ruoyi/inventory/mapper/StorageLocationsMapper.java
#	ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml
```
  yubin committed Dec 12, 2025
  b9c85d55 Browse Files
- 导入 · 19bd4ddb
  yubin committed Dec 12, 2025
  
  19bd4ddb Browse Files
11 Dec, 2025 14 commits
- 修正库存查询错误 · c7c0210f
  wangchunyang committed Dec 11, 2025
  
  c7c0210f Browse Files
- 统计相关功能 · 835ab1b5
  wangchunyang committed Dec 11, 2025
  
  835ab1b5 Browse Files
- 测试优化前端2 · bdfed8f5
  chuishuo committed Dec 11, 2025
  
  bdfed8f5 Browse Files
- 测试优化前端 · a7793256
  chuishuo committed Dec 11, 2025
  
  a7793256 Browse Files
- 库存入库chart · 987d696f
  ningjihai committed Dec 11, 2025
  
  987d696f Browse Files
- 首页 · 5fffa8a9
  ningjihai committed Dec 11, 2025
  
  5fffa8a9 Browse Files
- 首页 · 686016df
  ningjihai committed Dec 11, 2025
  
  686016df Browse Files
- 库位修改 · c5ac9fed
  yubin committed Dec 11, 2025
  
  c5ac9fed Browse Files
- Merge remote-tracking branch 'origin/master' · 2373f21f
  yubin committed Dec 11, 2025
  
  2373f21f Browse Files
- 库位修改 · 5b56f7ea
  yubin committed Dec 11, 2025
  
  5b56f7ea Browse Files
- 统计api bug · d97af811
  zhangtw committed Dec 11, 2025
  
  d97af811 Browse Files
- Merge remote-tracking branch 'origin/master' · 7c470ce3
```
# Conflicts:
#	ruoyi-inventory/src/main/resources/mapper/inventory/StorageLocationsMapper.xml
```
  yubin committed Dec 11, 2025
  7c470ce3 Browse Files
- 出库 · 37ede93e
  yubin committed Dec 11, 2025
  
  37ede93e Browse Files
- 统计api · f7e6543a
  zhangtw committed Dec 11, 2025
  
  f7e6543a Browse Files
10 Dec, 2025 5 commits
- 新增字段 ---完成 · 8d10b3c4
```
关联改为用id（物料、库位、仓库）——测试数据有问题，需要造数据后再测试
首页统计接口--完成
```
  chuishuo committed Dec 10, 2025
  8d10b3c4 Browse Files
- Merge remote-tracking branch 'origin/master' · c37e3e25
  yubin committed Dec 10, 2025
  
  c37e3e25 Browse Files
- 未进行版本管理的VO · c38b7b1a
  zhangtw committed Dec 10, 2025
  
  c38b7b1a Browse Files
- Merge remote-tracking branch 'origin/master' · 6f0ad6d5
```
# Conflicts:
#	ruoyi-inventory/src/main/java/com/ruoyi/inventory/controller/InventoryController.java
```
  yubin committed Dec 10, 2025
  6f0ad6d5 Browse Files
- 物料配置风险等级字典 · bd8d2429
```
新增统计api
```
  zhangtw committed Dec 10, 2025
  bd8d2429 Browse Files