 王奎兴
|
361a91d701
|
发31
|
2026-09-07 19:02:39 +08:00 |
|
|
王奎兴
|
3471874139
|
退货入库;
|
2026-09-07 18:58:33 +08:00 |
|
|
王奎兴
|
a38e28bb97
|
退货入库;
|
2026-09-07 18:57:51 +08:00 |
|
|
王奎兴
|
6856899afc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-09-07 17:23:10 +08:00 |
|
|
王奎兴
|
6d7be15d97
|
发31
|
2026-09-07 17:23:01 +08:00 |
|
|
王奎兴
|
1a80f715dd
|
恢复xxl
|
2026-09-07 17:16:11 +08:00 |
|
|
王奎兴
|
0ace96ea9f
|
恢复xxl
|
2026-09-07 17:06:27 +08:00 |
|
|
王奎兴
|
34014f40a5
|
Merge branch 'dev-ty1.2' into dev
|
2026-09-07 16:57:14 +08:00 |
|
|
王奎兴
|
32459fd443
|
xxl-job配置；
|
2026-09-07 11:33:14 +08:00 |
|
|
王奎兴
|
625b195183
|
发测试
|
2026-09-07 10:21:36 +08:00 |
|
|
王奎兴
|
0c95470300
|
Merge branch 'dev-ty1.2' into dev-bms-260826
|
2026-09-07 10:19:22 +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 |
|
|
王奎兴
|
f6c454765e
|
jobid查询接口;
|
2026-09-05 19:21:17 +08:00 |
|
|
王奎兴
|
25102b5207
|
jobid查询接口;
|
2026-09-05 19:14:34 +08:00 |
|
|
王奎兴
|
6708353379
|
jobid查询接口;
|
2026-09-05 19:08:42 +08:00 |
|
|
王奎兴
|
20d11dc9b2
|
jobid查询接口;
|
2026-09-05 19:00:02 +08:00 |
|
|
王奎兴
|
fa7db5df0c
|
jobid查询接口;
|
2026-09-05 18:52:30 +08:00 |
|
|
王奎兴
|
cb1a1ec9a6
|
jobid查询接口;
|
2026-09-05 18:48:19 +08:00 |
|
|
王奎兴
|
3abac7b3d6
|
jobid查询接口;
|
2026-09-05 18:44:25 +08:00 |
|
|
王奎兴
|
cecfe3e777
|
jobid查询接口;
|
2026-09-05 18:28:34 +08:00 |
|
|
王奎兴
|
104fc8bbef
|
code
|
2026-09-05 18:19:25 +08:00 |
|
|
王奎兴
|
d9e5cede10
|
code
|
2026-09-05 17:59:18 +08:00 |
|
|
王奎兴
|
1689da1911
|
token
|
2026-09-05 17:51:37 +08:00 |
|
|
王奎兴
|
c043da88e4
|
groupid
|
2026-09-05 17:41:01 +08:00 |
|
|
王奎兴
|
d10a81fc42
|
自动添加xxl任务;
|
2026-09-05 17:37:33 +08:00 |
|
|
王奎兴
|
10bba6fd9e
|
物料仓租修改;
|
2026-09-05 16:59:46 +08:00 |
|
|
王奎兴
|
bc09b77695
|
添加计费字段;
|
2026-09-05 16:55:10 +08:00 |
|
|
王奎兴
|
4d0ea8522e
|
发31
|
2026-09-05 15:52:37 +08:00 |
|
|
王奎兴
|
700eb3ee95
|
发30
|
2026-09-05 15:45:09 +08:00 |
|
|
王奎兴
|
fd62a7aff5
|
发31
|
2026-09-05 15:41:11 +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 |
|
|
王奎兴
|
84558fe2f6
|
xxl配置类;
|
2026-09-05 10:46:24 +08:00 |
|
|
王奎兴
|
3081460143
|
Merge branch 'dev' into dev_sfjk_0827
|
2026-09-05 10:23:32 +08:00 |
|
|
王奎兴
|
6c6afe4342
|
联查合同接口开发;
|
2026-09-05 10:22:24 +08:00 |
|
|
王奎兴
|
befdb82b53
|
联查合同接口开发;
|
2026-09-04 19:16:57 +08:00 |
|
|
王奎兴
|
5a329904c3
|
正式合同定时任务;
|
2026-09-04 15:40:19 +08:00 |
|
|
王奎兴
|
c25a9a5f68
|
发30
|
2026-09-04 14:06:48 +08:00 |
|
|
王奎兴
|
6b3912aae9
|
发30
|
2026-09-04 13:59:37 +08:00 |
|
|
王奎兴
|
12e43080b8
|
发31
|
2026-09-04 13:55:07 +08:00 |
|
|
王奎兴
|
77e0c77fbf
|
发31
|
2026-09-04 12:21:17 +08:00 |
|
|
王奎兴
|
03978d23d7
|
发30
|
2026-09-04 12:17:28 +08:00 |
|
|
王奎兴
|
ee7dbfcfb9
|
发30
|
2026-09-04 11:55:45 +08:00 |
|
|
王奎兴
|
94d05cca9c
|
发31
|
2026-09-04 11:52:53 +08:00 |
|
|
王奎兴
|
9fd3d34610
|
逻辑删除查询条件;
|
2026-09-04 11:51:10 +08:00 |
|
|
王奎兴
|
edb7a5343d
|
逻辑删除查询条件;
|
2026-09-04 11:37:06 +08:00 |
|
|
王奎兴
|
6108606daa
|
bms改造;
|
2026-09-04 11:11:39 +08:00 |
|
|
王奎兴
|
2c60dc8f84
|
bms改造;
|
2026-09-01 16:58:39 +08:00 |
|
|
王奎兴
|
8a9bbb3cef
|
本地配置
|
2026-08-31 09:33:58 +08:00 |
|
|
王奎兴
|
d4446e8482
|
发30
|
2026-08-28 17:35:43 +08:00 |
|
|
王奎兴
|
3349552e10
|
结算对象改造;
|
2026-08-28 17:32:02 +08:00 |
|
|
王奎兴
|
1e00681289
|
恢复
xxl-job
|
2026-08-26 17:28:50 +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 |
|
|
王奎兴
|
b1840c8965
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-26 14:08:38 +08:00 |
|
|
王奎兴
|
02a0b7aab6
|
xxl-job
|
2026-08-26 14:08:24 +08:00 |
|
|
王奎兴
|
4168f921f6
|
查询nc日志排序修改;
|
2026-08-25 10:52:28 +08:00 |
|
|
王奎兴
|
1916152775
|
查询委托方去除组织条件;
|
2026-08-25 10:41:58 +08:00 |
|
|
王奎兴
|
f5f792d3f8
|
发31
|
2026-08-24 17:03:55 +08:00 |
|
|
王奎兴
|
dbd61c0519
|
发30
|
2026-08-24 16:58:26 +08:00 |
|
|
王奎兴
|
cb5d933e0a
|
渗透测试修改;
|
2026-08-24 16:53:20 +08:00 |
|
|
王奎兴
|
5298e9d4e3
|
发30
|
2026-08-22 19:35:56 +08:00 |
|
|
王奎兴
|
06f61d7957
|
发31
|
2026-08-22 19:32:52 +08:00 |
|
|
王奎兴
|
4567f00858
|
发测试
|
2026-08-22 18:46:36 +08:00 |
|
|
王奎兴
|
0eb2f323c7
|
发31
|
2026-08-22 18:29:36 +08:00 |
|
|
王奎兴
|
a35030e2f5
|
登录报三方异常处理;
|
2026-08-22 18:27:56 +08:00 |
|
|
王奎兴
|
d1b1b27ab0
|
发30
|
2026-08-22 17:46:47 +08:00 |
|
|
王奎兴
|
4a6a2798e8
|
发31
|
2026-08-22 17:36:27 +08:00 |
|
|
王奎兴
|
1b3b1a6394
|
Merge branch 'dev' into dev-ty1.2
# Conflicts:
# mhd_wms/src/main/resources/bootstrap.yml
|
2026-08-22 13:59:22 +08:00 |
|
|
王奎兴
|
072a4f7d1f
|
退货验证发票号是否重复;维他奶导入单号添加校验;
|
2026-08-22 11:17:42 +08:00 |
|
|
王奎兴
|
63a19fbbcd
|
退货入库单编辑后才显示数量;
|
2026-08-22 10:26:54 +08:00 |
|
|
王奎兴
|
3e5ed28d69
|
发30
|
2026-08-20 18:14:37 +08:00 |
|
|
王奎兴
|
78d40d35be
|
发31
|
2026-08-20 18:13:30 +08:00 |
|
|
王奎兴
|
b8de1c00eb
|
发31
|
2026-08-20 17:41:09 +08:00 |
|
|
王奎兴
|
bf080609fe
|
发30
|
2026-08-20 17:39:44 +08:00 |
|
|
王奎兴
|
b415ed6fa0
|
出库预约业务类型查询;
|
2026-08-20 17:34:43 +08:00 |
|
|
王奎兴
|
694ed699ec
|
单号生成规则包含已删除;
|
2026-08-20 17:26:56 +08:00 |
|
|
王奎兴
|
0b26692a34
|
发31
|
2026-08-20 15:35:31 +08:00 |
|
|
王奎兴
|
c2af421c7f
|
发30
|
2026-08-20 15:31:40 +08:00 |
|
|
王奎兴
|
57f87baf85
|
发30
|
2026-08-20 15:30:59 +08:00 |
|
|
王奎兴
|
e23edadde6
|
发30
|
2026-08-20 14:59:53 +08:00 |
|
|
王奎兴
|
530254e000
|
发31
|
2026-08-20 14:57:14 +08:00 |
|
|
王奎兴
|
21fcc24e2e
|
发31
|
2026-08-20 14:20:07 +08:00 |
|
|
王奎兴
|
64350f565b
|
列表查询id不对;
|
2026-08-20 14:16:23 +08:00 |
|
|
王奎兴
|
7a769071e4
|
发30
|
2026-08-20 10:48:34 +08:00 |
|
|
王奎兴
|
b05f994e74
|
发31
|
2026-08-20 10:35:34 +08:00 |
|
|
王奎兴
|
624b7d7d6e
|
发测试;
|
2026-08-20 09:05:10 +08:00 |
|
|
王奎兴
|
0b61b813a5
|
Merge branch 'dev' into dev_820
|
2026-08-20 09:03:05 +08:00 |
|
|
王奎兴
|
4b434a2cd2
|
Merge branch 'refs/heads/dev' into dev_820
|
2026-08-18 16:36:28 +08:00 |
|
|
王奎兴
|
0376f8328c
|
无货主流程;
|
2026-08-18 16:35:33 +08:00 |
|
|
王奎兴
|
58e3882ef4
|
添加修改物料去除货主校验;
|
2026-08-18 10:20:26 +08:00 |
|
|
王奎兴
|
1d96322370
|
添加修改物料去除货主校验;
|
2026-08-18 09:53:30 +08:00 |
|
|
王奎兴
|
d079e35374
|
发30
|
2026-08-14 19:25:03 +08:00 |
|
|
王奎兴
|
466a9fa31f
|
发31
|
2026-08-14 18:54:02 +08:00 |
|
|
王奎兴
|
6f28cfdda0
|
Merge branch 'dev' into dev-ty1.2
|
2026-08-14 14:40:20 +08:00 |
|
|
王奎兴
|
5c472ad04e
|
分配逻辑;
|
2026-08-14 14:39:20 +08:00 |
|
|
王奎兴
|
070cdcd5de
|
仓码820
|
2026-08-14 14:36:46 +08:00 |
|
|
王奎兴
|
fd1436da9c
|
Merge branch 'dev' into dev-ty1.2
# Conflicts:
# mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java
# mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java
|
2026-08-13 16:46:09 +08:00 |
|
|
王奎兴
|
208024a6cc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-12 15:20:46 +08:00 |
|
|
王奎兴
|
1d01431354
|
货主账号查询入库业务单报错处理;
|
2026-08-12 15:20:36 +08:00 |
|