 王奎兴
|
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 |
|
|
王奎兴
|
57d5043ac2
|
配置修改;
|
2026-05-21 16:09:50 +08:00 |
|
|
王奎兴
|
a29ac3050e
|
配置修改;
|
2026-05-21 10:06:10 +08:00 |
|
|
王奎兴
|
ff5f078a78
|
配置修改;
|
2026-05-21 10:05:02 +08:00 |
|
|
王奎兴
|
7bd3834e2b
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-05-20 16:56:55 +08:00 |
|
|
王奎兴
|
23e57976f3
|
关务相关修改;omsbug修改;
|
2026-05-20 16:56:40 +08:00 |
|
|
王奎兴
|
e784dd289c
|
新正式环境配置;
|
2026-05-19 10:10:16 +08:00 |
|
|
王奎兴
|
ccebac5577
|
新正式环境配置;
|
2026-05-19 09:01:56 +08:00 |
|
|
王奎兴
|
9fcacbf9af
|
关务系统添加关务推送状态字段;
|
2026-05-18 11:49:08 +08:00 |
|
|
王奎兴
|
187710f578
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-05-18 10:26:49 +08:00 |
|
|
王奎兴
|
bb66a76762
|
oms页面查询条件;
|
2026-05-18 10:26:32 +08:00 |
|
|
王奎兴
|
c539b86535
|
入库预约单按是否报关查询;
|
2026-05-16 14:23:31 +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 |
|
|
王奎兴
|
226ded3ee9
|
入库预约单按是否报关查询;
|
2026-05-15 13:49:00 +08:00 |
|
|
王奎兴
|
177be49131
|
入库数量同步oms入库预约单;
|
2026-05-15 11:09:48 +08:00 |
|
|
王奎兴
|
e5a375f67c
|
oms小程序出入库明细查询;
|
2026-05-15 10:54:41 +08:00 |
|
|
王奎兴
|
3a6cefa0f6
|
oms出入库预约单导入接口开发;
|
2026-05-14 17:55:14 +08:00 |
|
|
王奎兴
|
495bed1b71
|
oms修改库存修改;
|
2026-05-13 13:57:14 +08:00 |
|
|
王奎兴
|
2e652ca8bc
|
feign地址修改;
|
2026-05-13 13:45:52 +08:00 |
|
|
王奎兴
|
a447e59096
|
oms预约单同步业务单修改;
|
2026-05-13 11:41:52 +08:00 |
|
|
王奎兴
|
7cc77eff09
|
oms预约单新增报错修改;
|
2026-05-13 11:17:16 +08:00 |
|
|
王奎兴
|
29f0f55c73
|
oms预约单新增报错修改;
|
2026-05-13 11:12:24 +08:00 |
|
|
王奎兴
|
6a3ebbeec4
|
OMS库存调整记录查询报错修改;
|
2026-05-13 10:03:00 +08:00 |
|
|
王奎兴
|
6d26806d8b
|
出入库预约单下发添加仓库信息;
|
2026-05-12 17:48:34 +08:00 |
|
|
王奎兴
|
a2ebe5af25
|
出入库预约单下发添加仓库信息;
|
2026-05-12 15:27:59 +08:00 |
|
|
王奎兴
|
00745d00b1
|
入库预约单查询修改;
|
2026-05-12 14:50:46 +08:00 |
|
|
王奎兴
|
3998efb77b
|
oms入库预约单新增修改取消仓库校验;
|
2026-05-12 14:13:18 +08:00 |
|
|
王奎兴
|
515ba88f80
|
oms库存修改;
|
2026-05-12 09:39:48 +08:00 |
|
|
王奎兴
|
acbc8bfe02
|
计费单据 计费流水 费用科目添加计费单位等信息;
|
2026-05-11 17:41:35 +08:00 |
|
|
王奎兴
|
0e0bc88ecf
|
出入库费用登记按钮问题修改;
|
2026-05-11 09:28:25 +08:00 |
|
|
王奎兴
|
56193f6d23
|
Merge remote-tracking branch 'origin/dev_20260429' into dev_20260429
|
2026-05-09 16:18:20 +08:00 |
|
|
王奎兴
|
27af017450
|
计费单据查询单价;
|
2026-05-09 16:17:55 +08:00 |
|
|
王奎兴
|
0ca5bed1f9
|
计费单据查询单价;
|
2026-05-09 11:13:28 +08:00 |
|
|
王奎兴
|
7f131c8790
|
上架逻辑修改;
|
2026-05-08 18:04:42 +08:00 |
|
|
王奎兴
|
999bd1de3e
|
sql查询报错;
|
2026-05-08 15:00:18 +08:00 |
|
|
王奎兴
|
8bc716dabf
|
配置表查询修改;
|
2026-05-08 14:56:53 +08:00 |
|
|
王奎兴
|
18f6d2eb6c
|
feign正式环境修改;
|
2026-05-08 14:13:46 +08:00 |
|
|
王奎兴
|
e059b80071
|
wms上架新库存冻结数量有值问题修改;
|
2026-05-08 14:11:02 +08:00 |
|
|
王奎兴
|
f9f2441b52
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-05-08 10:11:44 +08:00 |
|
|
王奎兴
|
e8b4201a1c
|
oms配置表添加shipperid;
|
2026-05-08 10:11:34 +08:00 |
|
|
王奎兴
|
c62ccf943e
|
oms配置表添加shipperid;
|
2026-05-08 09:57:31 +08:00 |
|
|
王奎兴
|
e467193f03
|
oms配置表添加shipperid;
|
2026-05-08 09:52:36 +08:00 |
|
|
王奎兴
|
ab7534e134
|
oms配置表添加shipperid;
|
2026-05-08 09:27:43 +08:00 |
|
|
王奎兴
|
326bd9089b
|
feign改为正式url;
|
2026-05-08 08:45:32 +08:00 |
|
|
王奎兴
|
4c32d4032e
|
app仓储订单列表；
|
2026-05-07 09:43:11 +08:00 |
|
|
王奎兴
|
02da883a6b
|
app仓储订单列表；
|
2026-05-07 09:15:20 +08:00 |
|
|
王奎兴
|
2109a1b5b3
|
根据userid获取仓库;
|
2026-05-07 08:54:58 +08:00 |
|
|
王奎兴
|
ee11318540
|
仓储订单列表;
|
2026-05-06 18:01:40 +08:00 |
|
|
王奎兴
|
99d90a231d
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-05-06 17:56:19 +08:00 |
|
|
王奎兴
|
223da56807
|
仓储订单列表;
|
2026-05-06 17:56:07 +08:00 |
|
|
王奎兴
|
d86639ba4b
|
去除出库单id;
|
2026-05-06 14:07:10 +08:00 |
|
|
王奎兴
|
b843b27937
|
oms出库预约单确认修改状态;
|
2026-05-06 13:57:44 +08:00 |
|
|
王奎兴
|
a9c27b9d4c
|
mhd-bi发布测试;
|
2026-04-30 16:05:01 +08:00 |
|
|
王奎兴
|
0dc9dba78e
|
feign修改;
|
2026-04-30 15:19:05 +08:00 |
|
|
王奎兴
|
6faccde5e6
|
feign修改;
|
2026-04-30 15:05:24 +08:00 |
|
|
王奎兴
|
0b141796a1
|
mnd-bi;
|
2026-04-30 14:57:13 +08:00 |
|
|
王奎兴
|
7e00ca52c9
|
出库单明细加字段；
|
2026-04-29 16:41:49 +08:00 |
|
|
王奎兴
|
8a796aa432
|
出库单明细加字段；
|
2026-04-29 16:08:53 +08:00 |
|
|
王奎兴
|
d4748995b9
|
出库单明细加字段；
|
2026-04-29 15:19:37 +08:00 |
|
|
王奎兴
|
170e4e5d8d
|
保质期格式修改；
|
2026-04-29 14:33:42 +08:00 |
|
|
王奎兴
|
32ce218671
|
查询预约信息;
|
2026-04-29 14:26:26 +08:00 |
|
|
王奎兴
|
20c4973df3
|
查询预约信息;
|
2026-04-29 14:03:15 +08:00 |
|
|
王奎兴
|
8f7d44d725
|
配置修改;
|
2026-04-29 13:26:53 +08:00 |
|
|
王奎兴
|
11244cf89f
|
新增计费单据查询报错修改;
|
2026-04-29 13:24:25 +08:00 |
|
|
王奎兴
|
3759a54b49
|
新增计费单据查询报错修改;
|
2026-04-29 09:40:44 +08:00 |
|
|
王奎兴
|
7a11d68b8f
|
发布测试环境修改配置;
|
2026-04-28 15:11:57 +08:00 |
|
|
王奎兴
|
cfbef4bc30
|
发布测试环境修改配置;
|
2026-04-28 14:50:25 +08:00 |
|
|
王奎兴
|
a8f9d21805
|
推送nc添加费用科目信息;
|
2026-04-28 14:42:31 +08:00 |
|
|
王奎兴
|
745bb12dba
|
oms预约入库单驳回及确认;
|
2026-04-28 11:32:11 +08:00 |
|
|
王奎兴
|
99f086fdfa
|
上架库存修改;
|
2026-04-28 10:52:03 +08:00 |
|
|
王奎兴
|
71e4188622
|
上架库存修改;
|
2026-04-27 18:58:40 +08:00 |
|
|
王奎兴
|
4416e2ecf5
|
入库单添加客户信息;
|
2026-04-27 17:00:28 +08:00 |
|
|
王奎兴
|
ac2d2b9007
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-27 16:27:59 +08:00 |
|
|
王奎兴
|
52d50506c8
|
预约单查询报错;
|
2026-04-27 16:27:49 +08:00 |
|
|
王奎兴
|
3ae19e5a55
|
oms入库预约单添加字段;
|
2026-04-27 14:31:43 +08:00 |
|
|
王奎兴
|
293e6ee342
|
oms启动报错;
|
2026-04-27 13:13:02 +08:00 |
|
|
王奎兴
|
90652840bb
|
oms出入库预约单；
|
2026-04-27 10:45:29 +08:00 |
|
|
王奎兴
|
4be0a804a4
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml
|
2026-04-27 09:30:55 +08:00 |
|
|
王奎兴
|
4559bbc121
|
入库单查询报错;
|
2026-04-22 20:55:27 +08:00 |
|
|
王奎兴
|
a468ba33e7
|
feign调用地址修改;
|
2026-04-22 20:12:41 +08:00 |
|
|
王奎兴
|
315c107fbb
|
feign调用地址修改;
|
2026-04-22 19:45:57 +08:00 |
|
|
王奎兴
|
77477898d8
|
feign调用地址修改;
|
2026-04-22 19:14:52 +08:00 |
|
|
王奎兴
|
7dd5508006
|
feign调用地址修改;
|
2026-04-22 19:03:04 +08:00 |
|
|
王奎兴
|
724ae6c774
|
Merge branch 'dev_WMS20260401' into dev
|
2026-04-22 18:42:51 +08:00 |
|
|
王奎兴
|
798e95521a
|
散租添加出账日;
|
2026-04-22 18:35:42 +08:00 |
|
|
王奎兴
|
3aa62897f4
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 18:30:59 +08:00 |
|
|
王奎兴
|
336a33f6e7
|
omsfeign熔断;
|
2026-04-22 18:30:39 +08:00 |
|
|
王奎兴
|
48f53b2d35
|
推送oms报错问题修改;
|
2026-04-22 18:23:43 +08:00 |
|
|
王奎兴
|
e94fd329a1
|
推送oms报错问题修改;
|
2026-04-22 18:22:07 +08:00 |
|
|
王奎兴
|
676c95233e
|
推送oms报错问题修改;
|
2026-04-22 18:19:10 +08:00 |
|
|
王奎兴
|
3ca94bc4cf
|
推送oms报错问题修改;
|
2026-04-22 18:15:24 +08:00 |
|
|
王奎兴
|
5b792ccae5
|
oms出库单查询查询业务单号;
|
2026-04-22 17:46:09 +08:00 |
|
|
王奎兴
|
b7d14706d7
|
Merge branch 'dev' into dev_WMS20260401
|
2026-04-22 17:13:44 +08:00 |
|
|
王奎兴
|
7b4d4cb9a9
|
申请发票报错;
|
2026-04-22 16:58:36 +08:00 |
|
|
王奎兴
|
38fb1c8ce5
|
oms推送wms加结算币种业务员信息;
|
2026-04-22 16:52:40 +08:00 |
|
|
王奎兴
|
62b4f69058
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 16:21:26 +08:00 |
|
|
王奎兴
|
abd1545c15
|
bms申请发票报错;
|
2026-04-22 16:21:16 +08:00 |
|
|
王奎兴
|
2864812f11
|
Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
|
2026-04-22 15:48:30 +08:00 |
|
|
王奎兴
|
1f8b7ef0e8
|
oms入库单入库数量;
|
2026-04-22 15:48:21 +08:00 |
|