Commit Graph
57 Commits
Author SHA1 Message Date
赵辉 3a004607b2 执行单添加发牌状态与日期,入库单添加运输业务单号 2026-06-04 16:28:08 +08:00
zhaoqing 047335ccbb 查询客户nc编码 2026-06-02 11:42:35 +08:00
赵辉 f8149b7493 司机新增报错 2026-05-28 17:48:54 +08:00
秦鸿展 88832114fa 添加字段 userAreaName 2026-05-28 15:49:33 +08:00
秦鸿展 1679403f56 客户修改和删除BUG修改 2026-05-27 14:08:36 +08:00
王奎兴 9a6e544d56 Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
2026-05-26 08:38:02 +08:00
赵辉 dc65b1ae12 新增委托方修改 2026-05-22 14:22:12 +08:00
赵辉 540b805546 新增委托方修改 2026-05-22 11:06:25 +08:00
赵辉 dbb1cace5b 新增委托方修改 2026-05-22 11:02:18 +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 e8dfcd723f 商业合作伙伴推送人姓名字段添加 2026-05-14 11:31:26 +08:00
zhaoqing d32e7e97f6 OMS-GW推送-商业合作伙伴 2026-05-06 14:16:14 +08:00
zhaoqing 2973c0c4b1 OMS-GW推送-商业合作伙伴-user_center 2026-04-30 16:38:29 +08:00
赵辉 269fef04b2 Merge branch 'dev' into dev_WMS20260401
# Conflicts:
#	mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
2026-04-28 13:41:57 +08:00
zhaoqing 1ea3f13a99 基础数据-委托方管理-联系方式/登录账号相关修改 2026-04-27 18:04:29 +08:00
zhou-hongcheng 484741e12b 路线波次生成客户管理页面查询路线信息 2026-04-27 17:36:24 +08:00
zhaoqing 6df0c40d0b tms-新增/编辑车队 2026-04-27 15:27:56 +08:00
zhaoqing eb3d7ad0c8 tms-新增/编辑司机 2026-04-27 14:29:13 +08:00
zhou-hongcheng 3a7d3c0532 路线管理列表 2026-04-27 13:40:30 +08:00
秦鸿展 c0fd835365 新增客户修改 2026-04-17 19:14:07 +08:00
王奎兴 642a7d28ba 新增委托方和员工修改; 2026-03-25 09:23:01 +08:00
王奎兴 cfb8af87c8 Revert "新增委托方和员工修改;"
This reverts commit c5cfe8d2e3.
2026-03-25 09:18:30 +08:00
王奎兴 c5cfe8d2e3 新增委托方和员工修改; 2026-03-25 09:08:00 +08:00
赵辉 59aa30411c tms3.24修改 2026-03-24 16:23:01 +08:00
王奎兴 15b72ae970 同步结算对象修改用户名 2026-03-23 16:58:23 +08:00
王奎兴 5fdd55f2de 委托方添加查不到问题修改; 2026-03-20 14:52:10 +08:00
王奎兴 caf5adfc3e bms2相关修改; 2026-03-18 21:11:49 +08:00
zhou-hongcheng 1b9d92ea76 备注信息 2026-03-18 17:55:37 +08:00
秦鸿展 63b3e26d5f PDA任务转接只显示仓库绑定的用户,盘点详情显示物料批次属性 2026-03-13 11:35:34 +08:00
zhou-hongcheng 1176add6ad 新增货主业务类型改为托运业务 2026-02-27 15:55:20 +08:00
王奎兴 240e18d81e Merge branch 'wms_dev' into dev 2026-02-12 10:10:49 +08:00
秦鸿展 308f79b804 任务BUG修改 2026-02-09 16:53:46 +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
赵辉 fa68e9dc0e 修改密码修正 2026-02-06 18:50:13 +08:00
zhou-hongcheng 0194adc794 修改密码后不能用新密码登录bug 2026-02-03 14:30:54 +08:00
赵辉 e26dc853d5 oms发单 2026-01-28 13:20:09 +08:00
王奎兴 76fff6437d 出库流程操作库存;出库单导入调整; 2026-01-27 17:23:06 +08:00
zhou-hongcheng 7802b28143 新增货主后列表不展示bug修改 2026-01-23 15:30:01 +08:00
zhou-hongcheng fe174b45ef 货主管理新增字段 2026-01-20 16:09:23 +08:00
秦鸿展 7f8732dd02 选择车队不一致修改 2026-01-19 15:32:00 +08:00
王奎兴 9996f59fe4 角色管理查询不过滤RoleGrade 2026-01-14 23:25:17 +08:00
1745237360-cloud 035593b419 数据权限的bug修改260113 2026-01-13 11:32:57 +08:00
赵辉 d2e8d6ab30 Merge branch 'refs/heads/dev_zh_ty_20260108' into dev 2026-01-12 13:54:15 +08:00
赵辉 540a687f7e 修改副驾绑定 2026-01-12 13:53:01 +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
王奎兴 40744bb5c1 开通钱包失败取消 2025-12-30 10:54:16 +08:00