 rcx
|
117019c55c
|
30
|
2026-09-11 17:46:07 +08:00 |
|
 赵辉
|
31c27c16c6
|
user31
|
2026-09-11 17:28:40 +08:00 |
|
 秦鸿展
|
d69af9ef20
|
30
|
2026-09-10 16:49:24 +08:00 |
|
|
rcx
|
fd3a9afddf
|
发31
|
2026-09-08 17:52:42 +08:00 |
|
|
rcx
|
0358c694ea
|
发30
|
2026-09-08 17:46:49 +08:00 |
|
|
rcx
|
06202b652a
|
发测试
|
2026-09-08 09:32:47 +08:00 |
|
 王奎兴
|
361a91d701
|
发31
|
2026-09-07 19:02:39 +08:00 |
|
|
rcx
|
976ab715af
|
发30
|
2026-09-07 18:02:10 +08:00 |
|
|
rcx
|
b6a69411f1
|
发 测试
|
2026-09-07 14:25:29 +08:00 |
|
|
王奎兴
|
625b195183
|
发测试
|
2026-09-07 10:21:36 +08:00 |
|
|
王奎兴
|
ba3a540a94
|
Merge branch 'dev' into dev-bms-260826
# 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_wms/src/main/resources/bootstrap.yml
|
2026-09-07 10:00:28 +08:00 |
|
|
王奎兴
|
a484e81b32
|
发测试
|
2026-09-07 09:23:22 +08:00 |
|
|
秦鸿展
|
3c81e37e32
|
30
|
2026-09-05 18:39:15 +08:00 |
|
|
王奎兴
|
4d0ea8522e
|
发31
|
2026-09-05 15:52:37 +08:00 |
|
|
王奎兴
|
700eb3ee95
|
发30
|
2026-09-05 15:45:09 +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 |
|
|
王奎兴
|
7790850da3
|
自动生成job
|
2026-09-05 14:51:25 +08:00 |
|
|
秦鸿展
|
9e186bc034
|
南岐GPS接口
|
2026-09-05 14:38:49 +08:00 |
|
|
rcx
|
c0065074d3
|
Merge branch 'dev-ty1.2' into dev
|
2026-09-05 13:53:01 +08:00 |
|
|
rcx
|
c0bcedbdc3
|
fix(wms,oms): JSON日期反序列化兼容yyyy-MM-dd纯日期格式
- 库存查询日期只保留年月日后，前端回传纯日期（如 createTime=2026-07-06）触发
@JsonFormat("yyyy-MM-dd HH:mm:ss") 严格格式反序列化 InvalidFormatException
- 新增 FlexibleDateDeserializer：字段 @JsonFormat 模式优先严格解析，失败后兼容
yyyy-MM-dd HH:mm:ss / yyyy-MM-dd HH:mm / yyyy-MM-dd / 时间戳 / ISO-8601
- 仅在 OMS/WMS 通过 Module Bean 注册生效，不改动 BaseVOEntity 全局行为
|
2026-09-05 13:38:06 +08:00 |
|
|
秦鸿展
|
b46483263b
|
31
|
2026-09-05 10:36:12 +08:00 |
|
|
王奎兴
|
5a329904c3
|
正式合同定时任务;
|
2026-09-04 15:40:19 +08:00 |
|
|
王奎兴
|
6b3912aae9
|
发30
|
2026-09-04 13:59:37 +08:00 |
|
|
王奎兴
|
77e0c77fbf
|
发31
|
2026-09-04 12:21:17 +08:00 |
|
|
王奎兴
|
ee7dbfcfb9
|
发30
|
2026-09-04 11:55:45 +08:00 |
|
|
王奎兴
|
94d05cca9c
|
发31
|
2026-09-04 11:52:53 +08:00 |
|
|
rcx
|
ce3bb036fa
|
发 测试
|
2026-09-04 10:50:48 +08:00 |
|
|
rcx
|
a549ac1507
|
发 31
|
2026-09-03 18:32:25 +08:00 |
|
|
rcx
|
bf3f0a2bfe
|
发 30
|
2026-09-03 18:25:37 +08:00 |
|
|
rcx
|
34496de969
|
发测试
|
2026-09-03 16:04:04 +08:00 |
|
|
rcx
|
57312753ed
|
发 30
|
2026-09-02 19:52:47 +08:00 |
|
|
rcx
|
6d7e42bcde
|
发 31
|
2026-09-02 16:55:19 +08:00 |
|
|
rcx
|
61572c536a
|
发 30
|
2026-09-02 16:48:35 +08:00 |
|
|
rcx
|
f5a7c8c1f3
|
发 31
|
2026-09-02 00:12:59 +08:00 |
|
|
rcx
|
3989d75f05
|
发 30
|
2026-09-01 23:50:34 +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 |
|
|
rcx
|
19e897cae0
|
发 30
|
2026-09-01 23:02:30 +08:00 |
|
|
rcx
|
91bdb99ec2
|
发 31
|
2026-09-01 22:50:50 +08:00 |
|
|
rcx
|
004580e252
|
发 30
|
2026-09-01 22:36:10 +08:00 |
|
|
赵辉
|
1cec762930
|
user30
|
2026-09-01 17:35:21 +08:00 |
|
|
赵辉
|
1208e02fe7
|
yms租户同步
|
2026-09-01 17:14:23 +08:00 |
|
|
rcx
|
5ba6a3b73d
|
发测试
|
2026-08-31 13:43:11 +08:00 |
|
|
王奎兴
|
d4446e8482
|
发30
|
2026-08-28 17:35:43 +08:00 |
|
|
rcx
|
5127123236
|
发31
|
2026-08-27 16:38:33 +08:00 |
|
|
rcx
|
7b0d08a132
|
发30
|
2026-08-27 16:33:43 +08:00 |
|
|
rcx
|
5e3a0d86d0
|
发测试
|
2026-08-27 14:21:23 +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 |
|