 王奎兴
|
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
|
87dae51a15
|
fix(bms): 发票列表兼容pageNum/pageNo参数名，修复翻页始终返回第一页；排序补id兜底防翻页重复
|
2026-09-02 19:31:01 +08:00 |
|
|
王奎兴
|
3349552e10
|
结算对象改造;
|
2026-08-28 17:32:02 +08:00 |
|
|
王奎兴
|
1916152775
|
查询委托方去除组织条件;
|
2026-08-25 10:41:58 +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 |
|
|
王奎兴
|
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 |
|
|
王奎兴
|
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 |
|
|
王奎兴
|
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 |
|
 zhaoqing
|
1297f920be
|
fix(bms):单据计费查询条件添加
|
2026-07-31 14:59:20 +08:00 |
|
|
王奎兴
|
914a751d96
|
bms2.0应收单和收款单推送nc修改;
|
2026-07-23 17:46:32 +08:00 |
|
|
王奎兴
|
a96b03a060
|
nc推送改造(进行中);
|
2026-07-23 14:49:19 +08:00 |
|
 赵辉
|
553e0eebee
|
bug修改
|
2026-07-03 22:05:37 +08:00 |
|
|
王奎兴
|
19696cbb6a
|
bug修改;
|
2026-07-03 19:15:14 +08:00 |
|
|
王奎兴
|
40c16f17cc
|
bug修改;
|
2026-07-03 19:10:27 +08:00 |
|
|
王奎兴
|
8893eda62d
|
执行及取消执行;nc推送客户nc编码查询逻辑修改;
|
2026-06-26 18:27:24 +08:00 |
|
 秦鸿展
|
801bfdff5f
|
数据同步问题修改
|
2026-06-11 16:25:27 +08:00 |
|
|
秦鸿展
|
1c72ce2ba5
|
PDA任务修改 B2字段添加
|
2026-06-04 16:59:16 +08:00 |
|
|
王奎兴
|
acbc8bfe02
|
计费单据 计费流水 费用科目添加计费单位等信息;
|
2026-05-11 17:41:35 +08:00 |
|
|
王奎兴
|
27af017450
|
计费单据查询单价;
|
2026-05-09 16:17:55 +08:00 |
|
|
赵辉
|
3d4907f49c
|
oms与bms修改
|
2026-04-17 09:29:27 +08:00 |
|
|
王奎兴
|
708d80bcd3
|
nc推送添加推送时间;nc动态获取组织;
|
2026-03-27 13:45:07 +08:00 |
|
|
王奎兴
|
b13791c922
|
发票页面添加实际开票用户;
|
2026-03-24 11:19:25 +08:00 |
|
|
王奎兴
|
959bc18fe1
|
收款收款卡号查询修改;
|
2026-03-23 11:38:49 +08:00 |
|
|
王奎兴
|
caf5adfc3e
|
bms2相关修改；
|
2026-03-18 21:11:49 +08:00 |
|
|
王奎兴
|
93125d3c36
|
bms2相关修改；
|
2026-03-17 17:28:31 +08:00 |
|
|
王奎兴
|
9dafdfc051
|
生成账单费用合并;
|
2026-03-16 18:29:33 +08:00 |
|
|
王奎兴
|
f83ff9ceef
|
获取ncurl修改;
|
2026-03-14 17:25:15 +08:00 |
|
|
王奎兴
|
91c74eed8b
|
bms2.0出账及发票修改;
|
2026-03-14 15:34:01 +08:00 |
|
|
王奎兴
|
2870e6729f
|
bms2.0出账及发票修改;
|
2026-03-14 14:29:38 +08:00 |
|
|
王奎兴
|
878d9ab1cf
|
nc推送动态获取url;
|
2026-03-02 10:42:23 +08:00 |
|
|
秦鸿展
|
c92e3e0ec6
|
BMS结算对象按照创建时间倒序排序新创建的在前面
|
2026-02-28 16:20:16 +08:00 |
|
|
秦鸿展
|
9bf5187d42
|
BMS合同管理新增结算主体客户类型编码查询
|
2026-02-28 15:57:32 +08:00 |
|
|
王奎兴
|
74c37ad0d4
|
应收账单增加发票状态查询条件;
|
2026-02-27 16:34:30 +08:00 |
|
|
王奎兴
|
3790cb6c54
|
查询社会统一信用编码;
|
2026-02-27 16:27:06 +08:00 |
|
|
王奎兴
|
16b0eaf50a
|
查询报错;
|
2026-02-27 14:27:02 +08:00 |
|
|
王奎兴
|
1738f12bdd
|
jeecg判空判断去除;
|
2026-02-27 14:23:59 +08:00 |
|
|
王奎兴
|
7fb245b8c2
|
bms2发票相关;
|
2026-02-26 15:59:39 +08:00 |
|
 zhou-hongcheng
|
442f95cbc6
|
流水汇总达梦sql不支持别名
|
2026-02-26 15:54:15 +08:00 |
|
|
秦鸿展
|
ec4e20fbe7
|
BMS列表“创建人、修改人”保存用户姓名，不保存账号
|
2026-02-26 11:29:00 +08:00 |
|
|
秦鸿展
|
2250f8f5f3
|
BMS页面数据按照创建时间倒序排序
|
2026-02-26 10:02:43 +08:00 |
|