 王奎兴
|
a484e81b32
|
发测试
|
2026-09-07 09:23:22 +08:00 |
|
|
王奎兴
|
b05c87e291
|
Merge branch 'dev' into dev-bms-260826
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
# mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/facade/IReservationStockInOrderService.java
# mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java
# mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
# mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
# mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
|
2026-09-05 15:14:35 +08:00 |
|
|
王奎兴
|
6108606daa
|
bms改造;
|
2026-09-04 11:11:39 +08:00 |
|
 秦鸿展
|
b5f710cd33
|
31
|
2026-09-02 20:49:09 +08:00 |
|
|
秦鸿展
|
bfffc6bbf1
|
App游客时正常展示消息页面
|
2026-09-02 20:46:31 +08:00 |
|
 rcx
|
471b515a45
|
Merge branch 'refs/heads/dev-ty1.2' into dev
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
# mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
# mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java
# mhd_oms/src/main/resources/bootstrap.yml
|
2026-09-01 23:49:08 +08:00 |
|
|
王奎兴
|
2c60dc8f84
|
bms改造;
|
2026-09-01 16:58:39 +08:00 |
|
|
王奎兴
|
8a9bbb3cef
|
本地配置
|
2026-08-31 09:33:58 +08:00 |
|
|
rcx
|
155f1866b4
|
feat(system):库区管理新增库区面积合计查询接口
新增 GET /storageSectionApi/sumStorageRegion，与库区列表 /list 相同筛选条件及组织数据权限，
SQL 端 IFNULL(SUM(storage_region),0) 返回面积合计(平方米)，无数据返回0；
抽取 queryList 数据权限为 applyQueryDataPermission 供列表与合计共用，/list 行为不变。
|
2026-08-28 18:01:44 +08:00 |
|
|
王奎兴
|
d4446e8482
|
发30
|
2026-08-28 17:35:43 +08:00 |
|
|
王奎兴
|
3349552e10
|
结算对象改造;
|
2026-08-28 17:32:02 +08:00 |
|
|
rcx
|
f1dec2298d
|
发 31
|
2026-08-26 18:04:44 +08:00 |
|
|
rcx
|
7b52764ae1
|
发 30
|
2026-08-26 17:52:23 +08:00 |
|
|
rcx
|
9eb2f347f7
|
发测试
|
2026-08-26 15:55:03 +08:00 |
|
|
王奎兴
|
a5a222a78e
|
Merge branch 'dev' into dev-ty1.2
# Conflicts:
# mhd-modules/mhd-system/src/main/resources/bootstrap.yml
|
2026-08-26 14:11:45 +08:00 |
|
|
rcx
|
4410162f39
|
发测试
|
2026-08-26 10:03:46 +08:00 |
|
|
王奎兴
|
f5f792d3f8
|
发31
|
2026-08-24 17:03:55 +08:00 |
|
|
王奎兴
|
7a769071e4
|
发30
|
2026-08-20 10:48:34 +08:00 |
|
|
王奎兴
|
b05f994e74
|
发31
|
2026-08-20 10:35:34 +08:00 |
|
|
王奎兴
|
624b7d7d6e
|
发测试;
|
2026-08-20 09:05:10 +08:00 |
|
|
王奎兴
|
d079e35374
|
发30
|
2026-08-14 19:25:03 +08:00 |
|
|
王奎兴
|
466a9fa31f
|
发31
|
2026-08-14 18:54:02 +08:00 |
|
|
rcx
|
7356208228
|
发测试
|
2026-08-14 15:30:04 +08:00 |
|
|
王奎兴
|
fd1436da9c
|
Merge branch 'dev' into dev-ty1.2
# Conflicts:
# mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
|
2026-08-13 16:46:09 +08:00 |
|
 zhaoqing
|
5cf46604fa
|
feat(system):查询信息根据编码和组织ID
|
2026-08-12 16:44:47 +08:00 |
|
|
rcx
|
6a84abf6dd
|
feat(system模块lease): 租赁管理增加停用功能，停用后不参与出租率计算
- LEASE 表新增 status 字段（1=启用，0=停用）
- Lease/LeasePO/LeaseDO/LeaseDTO 新增 status 字段
- LeaseMapper.xml 增加 status 查询字段与过滤条件
- 新增 LeaseApi.updateStatus 接口（PUT /updateStatus/{leaseIds}/{status}）
- 出租率计算（shipperLeaseDetails）过滤 status=1，停用租赁不再生成出租率数据
一个SQL文件，增加了一个字段，在测试和生产环境都需要执行
对应需求：仓库出租率 - 租赁管理增加停用功能
|
2026-08-11 18:03:09 +08:00 |
|
|
王奎兴
|
b29632cebc
|
发30
|
2026-08-10 20:03:59 +08:00 |
|
|
王奎兴
|
207734c75e
|
发31
|
2026-08-10 20:00:10 +08:00 |
|
|
王奎兴
|
14a5aedf15
|
Merge branch 'dev' into feature/dev-0729
|
2026-08-10 18:14:55 +08:00 |
|
|
王奎兴
|
23b5f96a0c
|
Merge branch 'dev-ty1.2' into dev
|
2026-08-08 14:26:11 +08:00 |
|
|
王奎兴
|
4b29406701
|
Merge branch 'dev' into feature/dev-0729
# Conflicts:
# mhd_bms/src/main/resources/bootstrap.yml
|
2026-08-08 11:39:21 +08:00 |
|
|
zhaoqing
|
ae138915ae
|
fix(system): 库位库区排序修改
|
2026-08-07 18:51:04 +08:00 |
|
 zhaoqing
|
3991496617
|
发测试bms wms system
|
2026-08-07 17:32:11 +08:00 |
|
|
王奎兴
|
f06c210ae9
|
仓库管理添加单号生成规则字段;
|
2026-08-06 16:40:56 +08:00 |
|
|
王奎兴
|
505f0aff5e
|
发31
|
2026-08-05 20:44:46 +08:00 |
|
|
王奎兴
|
b9dd2999f1
|
发30
|
2026-08-05 20:40:57 +08:00 |
|
|
zhaoqing
|
e5ef8740de
|
发测试system
|
2026-08-05 20:02:19 +08:00 |
|
|
zhaoqing
|
c5babe103e
|
feat(sys):合同新增报错
|
2026-07-31 23:57:48 +08:00 |
|
|
秦鸿展
|
e12beb1e0c
|
发30
|
2026-07-29 17:23:52 +08:00 |
|
|
秦鸿展
|
a1494846db
|
编辑库区
|
2026-07-29 16:33:40 +08:00 |
|
|
秦鸿展
|
1b85098063
|
发31
|
2026-07-17 22:18:59 +08:00 |
|
|
秦鸿展
|
d6d9ee1d5e
|
发30
|
2026-07-17 22:14:14 +08:00 |
|
|
秦鸿展
|
80e1639b83
|
发测试
|
2026-07-17 20:37:17 +08:00 |
|
|
王奎兴
|
a9e3d6cb6b
|
Merge branch 'dev' into dev_jinji
|
2026-07-17 18:06:41 +08:00 |
|
|
秦鸿展
|
914957e683
|
新增账单
|
2026-07-17 11:41:39 +08:00 |
|
|
王奎兴
|
4c58838842
|
发30
|
2026-07-17 00:48:43 +08:00 |
|
|
王奎兴
|
d27cca0217
|
发31
|
2026-07-17 00:44:34 +08:00 |
|
|
王奎兴
|
4fad415cb7
|
库位条码;
|
2026-07-16 13:51:59 +08:00 |
|
|
王奎兴
|
a23a4acef3
|
发测试
|
2026-07-16 12:21:57 +08:00 |
|
|
王奎兴
|
f4f2573af7
|
仓码pda改造;
|
2026-07-10 15:26:06 +08:00 |
|