 rcx
|
49ab26a8e9
|
fix(bms): 发票列表条数显示为0，注册MyBatis-Plus分页拦截器使Page生效
|
2026-09-02 18:33:50 +08:00 |
|
 王奎兴
|
4168f921f6
|
查询nc日志排序修改;
|
2026-08-25 10:52:28 +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
|
d6037d5846
|
fix(bms):单位 数量 单价
|
2026-08-12 18:01:34 +08:00 |
|
|
zhaoqing
|
5032cf2413
|
fix(bms):收款时间查询
|
2026-08-12 11:40:13 +08:00 |
|
|
zhaoqing
|
a10cfb0f55
|
fix(bms):收款设置收款时间
|
2026-08-12 10:19:57 +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 |
|
|
王奎兴
|
261bb07fb0
|
Merge branch 'dev-ty1.2' into dev
|
2026-08-07 17:23:38 +08:00 |
|
|
zhaoqing
|
0f26cd3d0d
|
feat(bms):新增账单费用支持修改（包含税费相关修改）
|
2026-08-07 09:40:32 +08:00 |
|
|
王奎兴
|
ba8dbdd859
|
推送nc结算币种;
|
2026-08-06 13:35:24 +08:00 |
|
|
王奎兴
|
2de4efbe65
|
发测试
|
2026-08-05 20:18:40 +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 |
|
|
王奎兴
|
0ee27d796f
|
回显应收应付;
|
2026-08-05 18:16:25 +08:00 |
|
|
王奎兴
|
7842ceaf71
|
回显应收应付;
|
2026-08-05 18:13:30 +08:00 |
|
|
王奎兴
|
987a7c564d
|
发31
|
2026-08-05 17:54:11 +08:00 |
|
|
王奎兴
|
0f4da97358
|
新增应收账单推送nc
|
2026-08-05 17:30:17 +08:00 |
|
|
王奎兴
|
b9fe4bc4d2
|
新增应收账单推送nc
|
2026-08-05 17:01:52 +08:00 |
|
|
王奎兴
|
a12ac94dd3
|
bms结算对象同步;
|
2026-08-04 11:46:59 +08:00 |
|
|
zhaoqing
|
5890660fe4
|
feat(bms):导出应收账单
|
2026-07-29 18:39:05 +08:00 |
|
|
zhaoqing
|
fa6ccad965
|
feat(bms):导出应收账单
|
2026-07-29 18:29:54 +08:00 |
|
 秦鸿展
|
0d70450997
|
费用修改
|
2026-07-29 15:51:11 +08:00 |
|
|
秦鸿展
|
8b9cd8c749
|
复制订单
|
2026-07-29 14:57:31 +08:00 |
|
|
王奎兴
|
914a751d96
|
bms2.0应收单和收款单推送nc修改;
|
2026-07-23 17:46:32 +08:00 |
|
|
王奎兴
|
a96b03a060
|
nc推送改造(进行中);
|
2026-07-23 14:49:19 +08:00 |
|
|
秦鸿展
|
f91a2248af
|
调整账单时间为保存修改
|
2026-07-21 16:49:53 +08:00 |
|
|
秦鸿展
|
f543c4a00f
|
新增费用科目BUG修改
|
2026-07-20 16:16:33 +08:00 |
|
|
秦鸿展
|
76c8b1f5aa
|
备注字段修改
|
2026-07-20 15:38:34 +08:00 |
|
|
秦鸿展
|
22590abbb8
|
调整账单报错
|
2026-07-20 14:40:11 +08:00 |
|
|
秦鸿展
|
1d28170d46
|
新增账单金额不一致报错
|
2026-07-20 12:47:00 +08:00 |
|
|
秦鸿展
|
07862301e6
|
应收账单新增报错
|
2026-07-17 20:31:35 +08:00 |
|
|
秦鸿展
|
d6fae412cd
|
应收账单新增报错
|
2026-07-17 20:17:04 +08:00 |
|
|
秦鸿展
|
7ee70dd06c
|
应收账单新增报错
|
2026-07-17 20:11:34 +08:00 |
|
|
秦鸿展
|
6f33fc3b64
|
应收账单添加明细报错
|
2026-07-17 19:40:49 +08:00 |
|
|
秦鸿展
|
5cc987c2c4
|
应收账单明细修改
|
2026-07-17 16:14:21 +08:00 |
|
|
秦鸿展
|
2373be59e6
|
紧急任务修改
|
2026-07-17 15:27:17 +08:00 |
|
|
秦鸿展
|
914957e683
|
新增账单
|
2026-07-17 11:41:39 +08:00 |
|
 赵辉
|
4a90bbd9ad
|
user30
|
2026-07-03 23:50:22 +08:00 |
|
|
王奎兴
|
cf85ffa37f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-07-03 22:08:48 +08:00 |
|
|
王奎兴
|
7d26d7915c
|
账单调整计算税额;
|
2026-07-03 22:08:34 +08:00 |
|
|
赵辉
|
553e0eebee
|
bug修改
|
2026-07-03 22:05:37 +08:00 |
|
|
王奎兴
|
ebfd3c3f2e
|
收款单同步失败
|
2026-07-03 21:37:50 +08:00 |
|
|
王奎兴
|
62ecfddb95
|
账单修改;
|
2026-07-03 21:04:19 +08:00 |
|
|
王奎兴
|
1c2bb30c44
|
Merge branch 'dev' into dev_v3.0.5
|
2026-07-02 19:39:40 +08:00 |
|
|
赵辉
|
7f38da20e1
|
bms修改
|
2026-07-02 19:29:23 +08:00 |
|
|
王奎兴
|
176bdbc633
|
Merge branch 'dev' into dev_user0622
# Conflicts:
# mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
|
2026-07-02 19:09:31 +08:00 |
|
|
王奎兴
|
ecd5e89172
|
3.0.5
|
2026-07-02 18:32:23 +08:00 |
|