Commit Graph
63 Commits
Author SHA1 Message Date
zhaoqing 721710252e 修改商业合作伙伴推送-各组织独立问题 2026-06-11 19:31:29 +08:00
zhaoqing 0c69a6ef36 修改商业合作伙伴推送-各组织独立问题 2026-06-11 11:22:43 +08:00
秦鸿展 b5f5f27b84 同步客商数据BUG修改 2026-06-11 10:46:33 +08:00
秦鸿展 c59fa363ee 客商委托方数据同步 2026-06-08 15:05:34 +08:00
zhaoqing 047335ccbb 查询客户nc编码 2026-06-02 11:42:35 +08:00
王奎兴 c7cb8614ef 日期时区问题修改; 2026-05-28 21:21:51 +08:00
王奎兴 39503f9f3c 日期时区问题修改; 2026-05-28 21:20:07 +08:00
秦鸿展 88832114fa 添加字段 userAreaName 2026-05-28 15:49:33 +08:00
赵辉 dbb1cace5b 新增委托方修改 2026-05-22 11:02:18 +08:00
赵辉 591cfa57d1 新增承运人修改 2026-05-22 09:43: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
zhaoqing b883d5ba8f 商业合作伙伴查询 2026-05-15 19:30:53 +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 5958db4fc2 oms-合作伙伴查询参数添加 2026-05-12 09:46:43 +08:00
zhaoqing d32e7e97f6 OMS-GW推送-商业合作伙伴 2026-05-06 14:16:14 +08:00
zhaoqing 4d732b1bf8 OMS-GW推送-商业合作伙伴 2026-05-06 13:51:57 +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 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
王奎兴 580088b53c 新增委托方和员工修改; 2026-03-25 09:23:43 +08:00
zhou-hongcheng 7d06b7c3d2 委托方货主名 2026-03-19 09:55:58 +08:00
zhou-hongcheng 1b9d92ea76 备注信息 2026-03-18 17:55:37 +08:00
zhou-hongcheng 95ad044e38 托运人编辑同步货主 2026-03-18 17:48:19 +08:00
zhou-hongcheng e5cea4e4c1 托运人编辑同步货主 2026-03-18 17:44:22 +08:00
zhou-hongcheng 775ed74712 托运人编辑同步货主 2026-03-18 17:40:45 +08:00
zhou-hongcheng 2b29339cbb 新增委托方用户字段赋值 2026-03-18 14:29:45 +08:00
zhou-hongcheng 86a2151330 托运方管理新增字段 2026-03-17 15:48:09 +08:00
zhou-hongcheng 725f0538de 托运方管理新增字段 2026-03-17 14:49:34 +08:00
zhou-hongcheng f637ec6f93 托运方管理新增字段 2026-03-17 11:08:28 +08:00
秦鸿展 63b3e26d5f PDA任务转接只显示仓库绑定的用户,盘点详情显示物料批次属性 2026-03-13 11:35:34 +08:00
zhou-hongcheng e3bc0b14fc 去掉联电话的校验 2026-03-13 09:17:55 +08:00
秦鸿展 d748f5a467 BMS应收账单收款人查询员工 2026-02-28 09:45:27 +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
zhou-hongcheng 5acc1059c1 货主管理查询条件优化 2026-02-06 11:12:39 +08:00
赵辉 e26dc853d5 oms发单 2026-01-28 13:20:09 +08:00
王奎兴 76fff6437d 出库流程操作库存;出库单导入调整; 2026-01-27 17:23:06 +08:00
zhou-hongcheng 9e8f0f195a 货主管理新增字段 补充备注 2026-01-21 16:54:26 +08:00
zhou-hongcheng fe174b45ef 货主管理新增字段 2026-01-20 16:09:23 +08:00
秦鸿展 7f8732dd02 选择车队不一致修改 2026-01-19 15:32:00 +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
王奎兴 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