 王奎兴
|
b8de1c00eb
|
发31
|
2026-08-20 17:41:09 +08:00 |
|
|
王奎兴
|
b415ed6fa0
|
出库预约业务类型查询;
|
2026-08-20 17:34:43 +08:00 |
|
|
王奎兴
|
694ed699ec
|
单号生成规则包含已删除;
|
2026-08-20 17:26:56 +08:00 |
|
 rcx
|
ff2b1965f7
|
fix(oms):入库业务单单号重复与入库链路计划数量翻倍修复
一、单号重复：业务单与客户预约两套取号计数器互不可见致撞号。
取号统一为跨两表MAX+1+存在性校验，保存前校验预取号占用，下发不再换号，Mapper新增existsByOrderNumber。
二、计划数量翻倍：编辑明细为软删(del_flag=2留存)，下发查明细未过滤del_flag，
软删行被复制进下游单据并计入头表数量(执行单数量≈业务单×2+修改差值)。
1. 预约→业务单下发、执行单推WMS：明细查询补del_flag=1过滤
2. executeAndIssue(执行并下发)：补防重复下发校验(issueTime非空拒绝)
3. pushInOrder/pushInOrderDetail：加幂等，防Feign重试插重复单
|
2026-08-20 14:06:50 +08:00 |
|
|
王奎兴
|
7a769071e4
|
发30
|
2026-08-20 10:48:34 +08:00 |
|
|
王奎兴
|
b05f994e74
|
发31
|
2026-08-20 10:35:34 +08:00 |
|
|
rcx
|
ef13d890be
|
fix(oms):入库执行单列表单号搜索查不到，businessNumber死条件改单号模糊互查；库存查询货主过滤移回主表并修正委托方误判
- 入库执行单列表：businessNumber条件原为BUSINESS_NUMBER精确等值，该列无写入恒空致全条件查询0条，改为业务单号/入库单号OR模糊互查
- 入库执行单列表：inOrderNumber精确等值改模糊like；删除重复的createByName条件；补businessInOrderNumber过滤（业务单号/入库单号互查）
- 库存查询：货主过滤(shipperId/Code/Name/shipperInfo)从物料表b移回库存主表a，避免LEFT JOIN退化INNER JOIN丢行
- 库存查询：委托方判定由组织层级改为UserPo.shipperEnterpriseName，避免二级组织运营人员(2841/2842)被误判强制按本人userId过滤
|
2026-08-20 10:17:16 +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 |
|
|
rcx
|
e489015e3e
|
fix(oms):下发过滤已删除明细，执行单不再残留已取消运输业务单号
|
2026-08-18 10:19:40 +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 |
|
|
王奎兴
|
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 |
|
|
王奎兴
|
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
|
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 |
|
|
王奎兴
|
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 |
|
|
王奎兴
|
993746ee41
|
出库单按规则生成;
|
2026-08-08 17:47:59 +08:00 |
|
|
王奎兴
|
fedeece533
|
扫二维码签名；入库单号规则；
|
2026-08-07 20:01:01 +08:00 |
|
|
王奎兴
|
c93445ca4c
|
业务单添加执行单号回显;
|
2026-08-06 15:18:15 +08:00 |
|
 秦鸿展
|
ef53355b87
|
发测试
|
2026-08-03 11:47:29 +08:00 |
|
|
王奎兴
|
04545a8219
|
Merge branch 'dev' into feature/dev-0729
|
2026-07-31 18:05:59 +08:00 |
|
|
王奎兴
|
1779bc2b23
|
发30
|
2026-07-31 18:02:30 +08:00 |
|
|
王奎兴
|
2a56ce433f
|
发31
|
2026-07-31 17:57:50 +08:00 |
|
|
王奎兴
|
b8605c6b43
|
预约单老系统数据导入;
|
2026-07-31 17:12:24 +08:00 |
|
|
王奎兴
|
f6ee1a3eee
|
预约单老系统数据导入;
|
2026-07-31 15:47:20 +08:00 |
|
|
王奎兴
|
c200645a15
|
发30
|
2026-07-29 14:32:11 +08:00 |
|
|
王奎兴
|
44e7581b2c
|
发31
|
2026-07-29 11:02:00 +08:00 |
|
|
zhaoqing
|
f32f43ab18
|
feat(oms):出入库明细查询
|
2026-07-24 15:46:30 +08:00 |
|
|
zhaoqing
|
eb3ada8335
|
feat(oms):出入库明细查询
|
2026-07-24 14:19:04 +08:00 |
|
|
zhaoqing
|
49f6832d3f
|
feat(oms):出库明细查询
|
2026-07-24 11:24:10 +08:00 |
|
|
zhaoqing
|
60bc140195
|
feat(oms):入库明细查询
|
2026-07-24 10:10:57 +08:00 |
|
|
zhaoqing
|
d268718f9b
|
fix(oms):入库/出库 预约/业务单号生成
|
2026-07-23 17:53:32 +08:00 |
|
|
王奎兴
|
fc16c1edf2
|
发30
|
2026-07-23 14:54:15 +08:00 |
|
|
王奎兴
|
4bd655e4da
|
nc推送改造(进行中);
|
2026-07-23 14:51:14 +08:00 |
|
|
zhaoqing
|
8681042a32
|
发测试
|
2026-07-23 11:47:53 +08:00 |
|
 高正杨
|
44c9953875
|
oms启动报错
|
2026-07-23 11:00:06 +08:00 |
|
|
王奎兴
|
36b31e5d52
|
Merge branch 'dev' into dev_crkbh_260721
# Conflicts:
# mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
# mhd_oms/src/main/resources/bootstrap.yml
|
2026-07-23 10:44:31 +08:00 |
|