 王奎兴
|
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 |
|
 zhaoqing
|
6252866f7c
|
fix(oms):明细表保额货物类型
|
2026-08-19 15:29:09 +08:00 |
|
|
zhaoqing
|
15c8a2b6e6
|
fix(wms):明细表入库时间
|
2026-08-19 09:14:44 +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 |
|
|
王奎兴
|
d079e35374
|
发30
|
2026-08-14 19:25:03 +08:00 |
|
|
王奎兴
|
466a9fa31f
|
发31
|
2026-08-14 18:54:02 +08:00 |
|
 zhaoqing
|
d74a28bceb
|
fix(oms):运输执行单排序查询报错
|
2026-08-14 18:21:18 +08:00 |
|
|
zhaoqing
|
1cc123917b
|
fix(oms):运输执行单排序
|
2026-08-14 17:38:34 +08:00 |
|
 rcx
|
7356208228
|
发测试
|
2026-08-14 15:30:04 +08:00 |
|
|
rcx
|
5963f6ed3a
|
fix(oms) : 运输管理 - 运输业务单 - 反审核订单 ： 优化异常提示信息
|
2026-08-14 14:49:13 +08:00 |
|
|
王奎兴
|
070cdcd5de
|
仓码820
|
2026-08-14 14:36:46 +08:00 |
|
|
rcx
|
6a87c5a75a
|
fix(oms): 预约入库单列表接口补充申报数量字段
reservationStockInOrderApi/list 返回缺少申报数量，原因为查询只查主表、
未关联明细表汇总，且返回对象无对应字段
- ReservationStockInOrderPO 新增 declaredQuantity 字段
- StockInOrderResult resultMap 增加 declaredQuantity 映射
- selectStockInOrderPo 片段增加 reservation_in_material_detail
的 DECLARED_QUANTITY 汇总子查询(按 level=1 过滤主明细行)
|
2026-08-14 11:02:18 +08:00 |
|
|
rcx
|
e35fa7d48e
|
Merge remote-tracking branch 'origin/dev-ty1.2' into dev-ty1.2
|
2026-08-13 17:21:21 +08:00 |
|
|
rcx
|
d5bdb5b419
|
feat(oms): 运输业务单新增反审核功能
审核通过后支持反审核，恢复订单到待审核状态以便修改
- 新增 /businessDocumentOrderApi/cancelAudit 接口
- 仅"审核通过(reviewStatus=1)"且未生成执行单的订单允许反审核
- 拆单主单反审核时级联清理生成的子单、子单地址及配送明细回填
|
2026-08-13 17:20:41 +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
|
123a5af241
|
fix(oms):运输业务单排序
|
2026-08-13 14:15:03 +08:00 |
|
|
zhaoqing
|
da31a81415
|
fix(oms):复制新增报错
|
2026-08-13 13:54:20 +08:00 |
|
|
zhaoqing
|
d17146dc4b
|
fix(oms):运输业务单排序
|
2026-08-13 10:03:39 +08:00 |
|
|
rcx
|
b37edf7c63
|
feat(oms): 业务单号改为yyMMdd+每日序号(每日重置,对齐TMS长度)
对应需求#072703，单号规则:年月日001,后面001每天重置
|
2026-08-12 18:17:29 +08:00 |
|
|
王奎兴
|
1d01431354
|
货主账号查询入库业务单报错处理;
|
2026-08-12 15:20:36 +08:00 |
|
|
王奎兴
|
a310c9dfa6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-08-12 14:02:09 +08:00 |
|
|
王奎兴
|
3866bfee05
|
生成单号规则处理;+
|
2026-08-12 14:01:56 +08:00 |
|
 秦鸿展
|
59ede5ceb7
|
31
|
2026-08-12 00:04:33 +08:00 |
|
|
秦鸿展
|
7e496834ae
|
30
|
2026-08-11 23:16:20 +08:00 |
|
|
秦鸿展
|
9519d8610b
|
31
|
2026-08-11 18:20:37 +08:00 |
|
|
rcx
|
d91aadca0b
|
feat(oms): 入仓委托单「下发到WMS」功能开发
实现 issueOrder 下发逻辑，推送主单与明细至 WMS；增加已审核校验、防重复下发、仓库必填校验
|
2026-08-11 09:16:28 +08:00 |
|
|
王奎兴
|
898cc32452
|
发测30
|
2026-08-11 02:03:10 +08:00 |
|
|
王奎兴
|
6cf2a8bc74
|
发测31
|
2026-08-11 02:01:20 +08:00 |
|
|
王奎兴
|
bce9969589
|
发测30
|
2026-08-11 01:58:44 +08:00 |
|
|
王奎兴
|
b73eb84b87
|
发测30
|
2026-08-10 22:32:58 +08:00 |
|
|
王奎兴
|
7d0d24ea77
|
发测31
|
2026-08-10 22:26:36 +08:00 |
|
|
王奎兴
|
15fdace0bc
|
发测试
|
2026-08-10 20:59:25 +08:00 |
|
|
王奎兴
|
b29632cebc
|
发30
|
2026-08-10 20:03:59 +08:00 |
|
|
王奎兴
|
207734c75e
|
发31
|
2026-08-10 20:00:10 +08:00 |
|
|
王奎兴
|
9df65779ad
|
保存电子签名id重复;
|
2026-08-10 17:26:48 +08:00 |
|
|
王奎兴
|
1241256787
|
电子签名签名方式修改;
|
2026-08-10 09:57:51 +08:00 |
|
|
王奎兴
|
5e65d63a4f
|
出入库单按规则生成;
|
2026-08-08 18:36:36 +08:00 |
|
|
王奎兴
|
296176c85e
|
出入库单按规则生成;
|
2026-08-08 18:02:30 +08:00 |
|
|
王奎兴
|
993746ee41
|
出库单按规则生成;
|
2026-08-08 17:47:59 +08:00 |
|
|
王奎兴
|
6a0818350a
|
出库单按规则生成;执行单回显通知单备注;
|
2026-08-08 16:41:22 +08:00 |
|
|
王奎兴
|
1b8a75aea5
|
入库单按规则生成;
|
2026-08-08 16:04:46 +08:00 |
|
|
王奎兴
|
e6aa8d59e2
|
发测试
|
2026-08-08 11:41: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 |
|
|
王奎兴
|
add7ef60db
|
签名方式修改;
|
2026-08-08 10:27:35 +08:00 |
|
|
王奎兴
|
d14cea759a
|
签名方式修改;
|
2026-08-08 10:25:59 +08:00 |
|
|
王奎兴
|
067fe1c2c9
|
签名方式修改;
|
2026-08-08 10:04:06 +08:00 |
|