 王奎兴
|
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 |
|
|
王奎兴
|
6108606daa
|
bms改造;
|
2026-09-04 11:11:39 +08:00 |
|
 rcx
|
ce3bb036fa
|
发 测试
|
2026-09-04 10:50:48 +08:00 |
|
|
rcx
|
87dae51a15
|
fix(bms): 发票列表兼容pageNum/pageNo参数名，修复翻页始终返回第一页；排序补id兜底防翻页重复
|
2026-09-02 19:31:01 +08:00 |
|
|
王奎兴
|
8a9bbb3cef
|
本地配置
|
2026-08-31 09:33:58 +08:00 |
|
|
王奎兴
|
3349552e10
|
结算对象改造;
|
2026-08-28 17:32:02 +08:00 |
|
|
rcx
|
f1dec2298d
|
发 31
|
2026-08-26 18:04:44 +08:00 |
|
|
rcx
|
7b52764ae1
|
发 30
|
2026-08-26 17:52:23 +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 |
|
|
rcx
|
4410162f39
|
发测试
|
2026-08-26 10:03:46 +08:00 |
|
 秦鸿展
|
f2f3fb9c19
|
30
|
2026-08-25 11:09:23 +08:00 |
|
|
秦鸿展
|
a62ed7c60f
|
31
|
2026-08-25 11:05:06 +08:00 |
|
|
王奎兴
|
1916152775
|
查询委托方去除组织条件;
|
2026-08-25 10:41:58 +08:00 |
|
|
rcx
|
8704df738c
|
Merge remote-tracking branch 'origin/dev' into dev-ty1.2
|
2026-08-21 15:47:44 +08:00 |
|
|
rcx
|
362f1b5e2f
|
fix(bms):科目编码重复致新增账单失败，税率查询按编码+名称取唯一；复制账单改生成新计费流水
- getTaxRate 增加 SUBJECT_NAME 匹配，费用科目编码重复（如1003同时有运输处理费/报关费3）时不再抛 TooManyResultsException，查不到税率兜底0
- addBill、开票/NC推送共4处调用点同步调整；计费流水号为空时只处理自身明细，防空指针
- copyBill 明细清空计费流水id并按原流水映射生成新JFLS流水号，防止复制提交后把原账单的流水改挂到新账单（原账单明细丢失）
- insertAndReturnId 币种空值兜底CNY（与addCost对齐）
|
2026-08-19 18:02:23 +08:00 |
|
|
rcx
|
83f05dd11d
|
feat(bms):新增费用统计分析报表，科目按模板类别归并、仓储拆散租/固定出租两行、行级占营收比，含34列导出与智能分析归因
|
2026-08-19 15:36:53 +08:00 |
|
|
rcx
|
7ed12c9405
|
feat(bms):应收账单添加费用币种空值兜底CNY、费用明细增加流水备注保存与显示
|
2026-08-19 11:02:52 +08:00 |
|
|
王奎兴
|
d079e35374
|
发30
|
2026-08-14 19:25:03 +08:00 |
|
|
王奎兴
|
466a9fa31f
|
发31
|
2026-08-14 18:54:02 +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 |
|
 zhaoqing
|
5032cf2413
|
fix(bms):收款时间查询
|
2026-08-12 11:40:13 +08:00 |
|
|
王奎兴
|
4b29406701
|
Merge branch 'dev' into feature/dev-0729
# Conflicts:
# mhd_bms/src/main/resources/bootstrap.yml
|
2026-08-08 11:39:21 +08:00 |
|
 zhaoqing
|
3991496617
|
发测试bms wms system
|
2026-08-07 17:32:11 +08:00 |
|
|
王奎兴
|
261bb07fb0
|
Merge branch 'dev-ty1.2' into dev
|
2026-08-07 17:23:38 +08:00 |
|
|
zhaoqing
|
ba3a90471a
|
feat(bms):计费规格 查询条件 添加费用科目
|
2026-08-07 15:56:47 +08:00 |
|
|
王奎兴
|
bcd7991725
|
推送nc结算币种;
|
2026-08-06 13:43:50 +08:00 |
|
|
王奎兴
|
db5e0e1a66
|
推送nc结算币种;
|
2026-08-06 13:39:12 +08:00 |
|
|
王奎兴
|
505f0aff5e
|
发31
|
2026-08-05 20:44:46 +08:00 |
|
|
王奎兴
|
091c971f30
|
发30
|
2026-08-05 20:40:12 +08:00 |
|
|
王奎兴
|
2de4efbe65
|
发测试
|
2026-08-05 20:18:40 +08:00 |
|
|
王奎兴
|
661e57ce62
|
发30
|
2026-08-05 19:23:05 +08:00 |
|
|
王奎兴
|
49233cf19b
|
发31
|
2026-08-05 19:20:52 +08:00 |
|
|
王奎兴
|
568ce3f96d
|
Merge branch 'dev' into dev-bms-0723
# Conflicts:
# mhd_bms/src/main/resources/bootstrap.yml
# mhd_bms/src/main/resources/mapper/SettlementCustomersMapper.xml
|
2026-08-05 18:19:19 +08:00 |
|
|
王奎兴
|
b9fe4bc4d2
|
新增应收账单推送nc
|
2026-08-05 17:01:52 +08:00 |
|
|
王奎兴
|
7a6c570a88
|
查货主卡死;
|
2026-08-05 15:17:00 +08:00 |
|
|
王奎兴
|
f1567eb81e
|
查货主卡死;
|
2026-08-05 14:48:09 +08:00 |
|
|
王奎兴
|
885d38565c
|
业务单详情添加执行单信息;
|
2026-08-05 14:45:32 +08:00 |
|
|
王奎兴
|
e366f78081
|
发测试
|
2026-08-04 13:58:31 +08:00 |
|
|
zhaoqing
|
1297f920be
|
fix(bms):单据计费查询条件添加
|
2026-07-31 14:59:20 +08:00 |
|
|
王奎兴
|
895c8d6a4b
|
发测试;
|
2026-07-23 17:48:19 +08:00 |
|
|
王奎兴
|
914a751d96
|
bms2.0应收单和收款单推送nc修改;
|
2026-07-23 17:46:32 +08:00 |
|
|
王奎兴
|
a96b03a060
|
nc推送改造(进行中);
|
2026-07-23 14:49:19 +08:00 |
|
|
秦鸿展
|
f5c096fe39
|
发30
|
2026-07-23 00:39:52 +08:00 |
|
|
秦鸿展
|
75e77c0476
|
发31
|
2026-07-23 00:18:41 +08:00 |
|
|
秦鸿展
|
8ea6a82acd
|
发测试
|
2026-07-22 16:26:45 +08:00 |
|
|
秦鸿展
|
65fd1e6a19
|
31
|
2026-07-20 16:18:19 +08:00 |
|
|
秦鸿展
|
98004ba989
|
30
|
2026-07-20 15:40:18 +08:00 |
|
|
秦鸿展
|
8542a25238
|
31
|
2026-07-20 14:43:33 +08:00 |
|
|
秦鸿展
|
bb68e118fa
|
30
|
2026-07-20 12:51:19 +08:00 |
|