 秦鸿展
|
914957e683
|
新增账单
|
2026-07-17 11:41:39 +08:00 |
|
 王奎兴
|
360cb8d95c
|
发30
|
2026-07-06 21:22:09 +08:00 |
|
 赵辉
|
a221c05ec9
|
31
|
2026-07-06 18:44:02 +08:00 |
|
|
王奎兴
|
196410331b
|
测试o
|
2026-07-04 01:07:56 +08:00 |
|
|
赵辉
|
9351bd8816
|
30
|
2026-07-04 00:24:31 +08:00 |
|
|
赵辉
|
4a6421c9cf
|
31
|
2026-07-04 00:08:18 +08:00 |
|
|
赵辉
|
4a90bbd9ad
|
user30
|
2026-07-03 23:50:22 +08:00 |
|
|
赵辉
|
553e0eebee
|
bug修改
|
2026-07-03 22:05:37 +08:00 |
|
|
王奎兴
|
e4a3835ee0
|
bug修改;
|
2026-07-03 17:49:31 +08:00 |
|
|
王奎兴
|
1c2bb30c44
|
Merge branch 'dev' into dev_v3.0.5
|
2026-07-02 19:39:40 +08:00 |
|
|
赵辉
|
7f38da20e1
|
bms修改
|
2026-07-02 19:29:23 +08:00 |
|
|
王奎兴
|
176bdbc633
|
Merge branch 'dev' into dev_user0622
# Conflicts:
# mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
|
2026-07-02 19:09:31 +08:00 |
|
|
王奎兴
|
01ec70e3c2
|
3.0.5
|
2026-07-02 15:59:58 +08:00 |
|
|
王奎兴
|
b178e79c8f
|
3.0.5
|
2026-07-02 15:04:20 +08:00 |
|
|
王奎兴
|
193db96e63
|
v3.0.5
|
2026-07-01 18:19:03 +08:00 |
|
|
王奎兴
|
183c84cb5b
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622
# Conflicts:
# mhd-user-center/src/main/resources/bootstrap.yml
|
2026-06-29 18:24:48 +08:00 |
|
|
赵辉
|
b26d79bab0
|
測試
|
2026-06-27 14:51:12 +08:00 |
|
|
王奎兴
|
8893eda62d
|
执行及取消执行;nc推送客户nc编码查询逻辑修改;
|
2026-06-26 18:27:24 +08:00 |
|
|
王奎兴
|
f704038362
|
根据组织ids查询仓库;
|
2026-06-25 11:04:58 +08:00 |
|
|
王奎兴
|
1642c50e0a
|
发30
|
2026-06-17 23:29:50 +08:00 |
|
|
王奎兴
|
e328eeb5c8
|
发31
|
2026-06-17 21:50:05 +08:00 |
|
|
秦鸿展
|
f8a28c04f6
|
字典查询BUG
|
2026-06-17 18:06:45 +08:00 |
|
|
秦鸿展
|
03444ed29d
|
字典查询修改当前组织没数据查询上级组织1
|
2026-06-17 17:04:10 +08:00 |
|
|
秦鸿展
|
1667a86a19
|
字典查询修改当前组织没数据查询上级组织
|
2026-06-17 16:33:43 +08:00 |
|
 高正杨
|
23dc97f1d0
|
去除字典按组织查询；
|
2026-06-17 15:32:05 +08:00 |
|
|
王奎兴
|
7ab7850d81
|
物料加字段;
|
2026-06-17 10:55:56 +08:00 |
|
|
王奎兴
|
c22fbc53c3
|
计价规则字段添加;
|
2026-06-16 15:06:53 +08:00 |
|
|
王奎兴
|
dd4fc13adc
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd-user-center/src/main/resources/bootstrap.yml
# mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
# mhd_oms/src/main/resources/bootstrap.yml
# mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
|
2026-06-16 11:11:48 +08:00 |
|
|
王奎兴
|
255be125d1
|
物料添加字段;
|
2026-06-16 09:54:20 +08:00 |
|
|
王奎兴
|
7ff8a2f108
|
物料添加字段;
|
2026-06-16 09:25:32 +08:00 |
|
|
秦鸿展
|
35c2bb6899
|
校验仓库下库区编码，名称重复问题
|
2026-06-12 15:52:02 +08:00 |
|
|
秦鸿展
|
f79084ed58
|
合同类型添加其他
|
2026-06-11 18:34:18 +08:00 |
|
|
秦鸿展
|
2912d10bbe
|
数据字典查询修改1
|
2026-06-11 15:08:06 +08:00 |
|
|
秦鸿展
|
473bcc02cd
|
数据字典查询修改
|
2026-06-11 15:05:54 +08:00 |
|
|
秦鸿展
|
cc77f0b5f8
|
字典类型唯一校验去掉
|
2026-05-30 00:33:32 +08:00 |
|
|
秦鸿展
|
08165d5018
|
字典添加组织查询，收货批次号逻辑修改
|
2026-05-29 22:03:20 +08:00 |
|
|
王奎兴
|
c7cb8614ef
|
日期时区问题修改;
|
2026-05-28 21:21:51 +08:00 |
|
|
王奎兴
|
39503f9f3c
|
日期时区问题修改;
|
2026-05-28 21:20:07 +08:00 |
|
|
秦鸿展
|
3ec47385be
|
测试环境配置修改
|
2026-05-21 17:03:45 +08:00 |
|
|
王奎兴
|
8a4d72e4fb
|
发布测试;
|
2026-05-21 16:22:32 +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 |
|
|
王奎兴
|
ff5f078a78
|
配置修改;
|
2026-05-21 10:05:02 +08:00 |
|
|
王奎兴
|
e784dd289c
|
新正式环境配置;
|
2026-05-19 10:10:16 +08:00 |
|
|
秦鸿展
|
99ceec0b77
|
Merge branch 'dev_20260429' into dev_WMS20260401
|
2026-05-16 16:14:57 +08:00 |
|
|
秦鸿展
|
3b5674b10c
|
计费策略修改封装
|
2026-05-16 10:43:09 +08:00 |
|
|
秦鸿展
|
6d0211d686
|
计费策略修改
|
2026-05-16 09:59:11 +08:00 |
|
|
秦鸿展
|
16fd402975
|
入库费用登记查询
|
2026-05-15 14:10:43 +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 |
|
|
秦鸿展
|
06abee70e3
|
字典类型加上组织字段修改
|
2026-05-14 15:23:48 +08:00 |
|
|
秦鸿展
|
f8c6be9db8
|
字典类型加上组织字段
|
2026-05-14 14:18:51 +08:00 |
|