 zhaoqing
|
e81a1fda06
|
修改商业合作伙伴推送-各组织独立问题
|
2026-06-11 15:29:52 +08:00 |
|
|
zhaoqing
|
e6fcccc6f1
|
修改商业合作伙伴推送-各组织独立问题
|
2026-06-11 12:27:54 +08:00 |
|
 秦鸿展
|
c59fa363ee
|
客商委托方数据同步
|
2026-06-08 15:05:34 +08:00 |
|
|
秦鸿展
|
88832114fa
|
添加字段 userAreaName
|
2026-05-28 15:49:33 +08:00 |
|
|
秦鸿展
|
1679403f56
|
客户修改和删除BUG修改
|
2026-05-27 14:08:36 +08:00 |
|
 王奎兴
|
dc26614e68
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
# mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
|
2026-05-21 16:14:56 +08:00 |
|
 赵辉
|
4f03f56126
|
组织排队开关，新增用户司机同步yms，oms预约单修改
|
2026-05-21 15:15:49 +08:00 |
|
|
王奎兴
|
206c85aaf7
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# 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/UserServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
# mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
|
2026-05-15 13:55:42 +08:00 |
|
 zhaoqing
|
6714278e3f
|
推送修改 合作伙伴查询添加推送人名称
|
2026-05-14 20:19:54 +08:00 |
|
|
zhaoqing
|
e8dfcd723f
|
商业合作伙伴推送人姓名字段添加
|
2026-05-14 11:31:26 +08:00 |
|
|
zhaoqing
|
424621143d
|
物料管理 查询添加条件 oms-gw推送-物料管理 推送更新状态
|
2026-05-09 19:33:36 +08:00 |
|
|
zhaoqing
|
e5b836012b
|
OMS-GW推送-商业合作伙伴
|
2026-05-06 16:05:38 +08:00 |
|
|
zhaoqing
|
2973c0c4b1
|
OMS-GW推送-商业合作伙伴-user_center
|
2026-04-30 16:38:29 +08:00 |
|
 zhou-hongcheng
|
f708fadb9a
|
客户管理页面查询
|
2026-04-27 15:04:37 +08:00 |
|
|
赵辉
|
e667f22564
|
oms修改
|
2026-04-21 16:25:52 +08:00 |
|
|
王奎兴
|
e9d4f699ee
|
wms费用科目修改;
|
2026-04-11 15:35:16 +08:00 |
|
|
zhou-hongcheng
|
742ef6ac1f
|
委托方查询sql
|
2026-03-17 17:53:13 +08:00 |
|
|
zhou-hongcheng
|
cacb9ac39a
|
委托方查询sql
|
2026-03-17 17:43:41 +08:00 |
|
|
zhou-hongcheng
|
86a2151330
|
托运方管理新增字段
|
2026-03-17 15:48:09 +08:00 |
|
|
zhou-hongcheng
|
f637ec6f93
|
托运方管理新增字段
|
2026-03-17 11:08:28 +08:00 |
|
|
王奎兴
|
5d89fdc0a6
|
Merge branch 'wms_dev' into wms_dev_hbbf
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
# mhd_oms/pom.xml
|
2026-02-09 14:29:47 +08:00 |
|
|
秦鸿展
|
244b8d7e6e
|
基础数据的BUG修改
|
2026-02-07 17:22:11 +08:00 |
|
|
zhou-hongcheng
|
5acc1059c1
|
货主管理查询条件优化
|
2026-02-06 11:12:39 +08:00 |
|
|
zhou-hongcheng
|
da439c9127
|
任务下发选择用户只显示当前用户登录的仓库已经绑定的账号
|
2026-02-05 10:33:36 +08:00 |
|
|
赵辉
|
e26dc853d5
|
oms发单
|
2026-01-28 13:20:09 +08:00 |
|
|
王奎兴
|
76fff6437d
|
出库流程操作库存;出库单导入调整;
|
2026-01-27 17:23:06 +08:00 |
|
|
zhou-hongcheng
|
fe174b45ef
|
货主管理新增字段
|
2026-01-20 16:09:23 +08:00 |
|
|
秦鸿展
|
7f8732dd02
|
选择车队不一致修改
|
2026-01-19 15:32:00 +08:00 |
|
 1745237360-cloud
|
035593b419
|
数据权限的bug修改260113
|
2026-01-13 11:32:57 +08:00 |
|
|
王奎兴
|
c337a7ed49
|
委托方查询接口添加结算币种;
|
2026-01-10 20:39:53 +08:00 |
|
|
1745237360-cloud
|
f7e6f70321
|
Merge branch 'refs/heads/dev_qinhongzhan' into dev
# Conflicts:
# mhd-auth/src/main/resources/bootstrap.yml
# mhd-gateway/src/main/resources/bootstrap.yml
# mhd-modules/mhd-system/src/main/resources/bootstrap.yml
# mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
# mhd-user-center/src/main/resources/bootstrap.yml
# mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
# mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
|
2026-01-10 16:45:38 +08:00 |
|
|
1745237360-cloud
|
4b427e1b2e
|
数据权限的修改
|
2026-01-10 16:39:33 +08:00 |
|
|
王奎兴
|
1259c189b0
|
华为云obs;结算货币;
|
2025-12-25 10:20:17 +08:00 |
|
|
王奎兴
|
1d9629127a
|
结算币种修改;
|
2025-12-23 13:38:56 +08:00 |
|
 hjx
|
e3f242f97b
|
问题修改
|
2025-12-17 18:41:12 +08:00 |
|
|
hjx
|
bcabed521d
|
问题修改
|
2025-12-17 18:02:55 +08:00 |
|
|
王奎兴
|
2199c8c739
|
获取网络货运司机id
|
2025-12-17 17:45:54 +08:00 |
|
|
王奎兴
|
6c2fb7c013
|
bug
|
2025-12-15 22:15:42 +08:00 |
|
|
赵辉
|
5cc3b9a62f
|
Merge branch 'refs/heads/nanguangmall' into dev
|
2025-12-15 17:16:34 +08:00 |
|
|
赵辉
|
21157b70ed
|
添加根据用户id查询企业信息
|
2025-12-15 17:15:16 +08:00 |
|
|
赵辉
|
2b385f45cd
|
Merge branch 'refs/heads/nanguangmall' into dev
|
2025-12-13 23:07:56 +08:00 |
|
|
赵辉
|
51b5ae5d13
|
12.13修改
|
2025-12-13 23:06:31 +08:00 |
|
|
王奎兴
|
97330de8ba
|
bug修复;
|
2025-12-13 20:48:24 +08:00 |
|
|
赵辉
|
df299a21ae
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall
|
2025-12-10 09:28:06 +08:00 |
|
|
王奎兴
|
4ca5121856
|
Merge branch 'dm_20251204' into dev
|
2025-12-09 19:14:42 +08:00 |
|
|
王奎兴
|
ab1472ff50
|
达梦适配大小写敏感
|
2025-12-09 18:43:00 +08:00 |
|
|
王奎兴
|
8a4423db5f
|
达梦适配遗漏
|
2025-12-08 15:02:50 +08:00 |
|
|
王奎兴
|
990f145846
|
达梦适配遗漏
|
2025-12-06 22:22:54 +08:00 |
|
|
王奎兴
|
0f8f3de71b
|
解决代码冲突
|
2025-12-06 22:17:12 +08:00 |
|
|
王奎兴
|
2a1e542704
|
Merge branch 'dm_20251204' into dev
# Conflicts:
# mhd-user-center/src/main/resources/mapper/UserMapper.xml
# mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
|
2025-12-06 22:15:26 +08:00 |
|