weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,974 Commits 16 Branches 0 Tags
test
Commit Graph
394 Commits
Author SHA1 Message Date
王奎兴 134ab4116c 发测试; 2026-09-14 17:04:04 +08:00
王奎兴 29cbf80b7b Merge branch 'dev-ty1.2' into test 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
 2026-09-14 17:00:41 +08:00
rcx b1d92fdda8 feat(oms,wms,system): OMS下单冻结库存（防超卖）——仓库级库存锁定模式 
- 仓库新增stock_lock_mode开关(1-下单冻结 2-分配库存冻结默认)，查询/独立切换接口+在途冻结单切换守卫
- WMS新增out_order_freeze_record冻结记录表：下单冻结/编辑原子重锁/取消解冻/分配承接/交接扣减/反审还原全状态机，条件更新防并发超卖
- OMS下单即冻结(失败阻断+落库失败补偿解冻)、已下发禁编辑、cancelIssueOrder补调WMS清理(修存量不同步)、cancelAuditState镜像还原修复
- 达梦SQL脚本3个(WAREHOUSE加列/冻结记录建表/主键列名修复)，测试库已执行并全流程实测通过
 2026-09-14 15:41:32 +08:00
王奎兴 74dbf674b0 Merge branch 'dev-bms-260826' into test 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/XxlJobServiceFeign.java
#	mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
#	mhd_oms/src/main/resources/bootstrap.yml
 2026-09-14 14:44:29 +08:00
王奎兴 ec5afcc5bd Merge branch 'dev-ty1.2' into test 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
#	mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
#	mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java
 2026-09-14 14:43:19 +08:00
王奎兴 8324d8dc31 发31 2026-09-14 11:09:46 +08:00
王奎兴 6ce35b58e4 发30 2026-09-14 11:05:55 +08:00
王奎兴 a9be03961a feign地址修改; 2026-09-12 17:57:49 +08:00
王奎兴 c2e3de244b feign地址修改; 2026-09-12 17:50:48 +08:00
王奎兴 9453aea60f feign地址修改; 2026-09-12 17:36:09 +08:00
王奎兴 c877696eca Merge branch 'dev' into dev-bms-260826 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
#	mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
#	mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java
 2026-09-12 17:28:12 +08:00
王奎兴 7f6006ca48 feign地址修改; 2026-09-12 17:20:01 +08:00
赵辉 defc8c3709 31 2026-09-12 10:03:33 +08:00
rcx 117019c55c 30 2026-09-11 17:46:07 +08:00
赵辉 31c27c16c6 user31 2026-09-11 17:28:40 +08:00
rcx b86ab75dcf fix(oms,wms): WMS出库明细uniqueId撞键修复+推单返回值校验 
- WMS反审/取消下发软删出库明细时置空uniqueId(表唯一约束不含del_flag)
- omsOrderAddDetail推单前自愈: 按本次推送uniqueId值跨执行单清归档行, 反审重发不再撞键
- OMS推单三处(单头/明细/配送明细)校验返回值, 失败报WMS真实原因, 不再静默吞掉后伪装成可用库存为0
- WmsServiceFeign三方法void改AjaxResult, 控制器与降级工厂同步
 2026-09-11 16:07:21 +08:00
rcx 788bae9a16 fix(oms,wms): 出库反审补全——重新下发自愈/仓库信息本地兜底/运输链路反审联动/归档查询修复 
- 反审后 issueStatus 置 3-已驳回(与入库侧同口径), 清空执行单号/货源单号
- 反审/取消下发软删执行明细时置空 uniqueId, 修复重新下发撞唯一约束
- 新增 WarehouseInfoApplicationService(Feign优先+本地跨库兜底), 出库侧8处调用点接入
- 反审联动软删运输链路: 运输业务单/执行单本地软删 + TMS deleteChainByExecuteOrderNumber
- WMS归档查询修复: 交接归档详情丢行/拣货归档数量恒0/复核列表归档汇总/OMS执行单已反审tab
 2026-09-11 11:42:42 +08:00
秦鸿展 0077e5d673 30 2026-09-10 23:29:33 +08:00
秦鸿展 eaeb100b22 调整同步TMS修改 2026-09-10 22:21:41 +08:00
秦鸿展 8d6c252eb4 调整同步TMS修改 2026-09-10 22:16:47 +08:00
秦鸿展 d69af9ef20 30 2026-09-10 16:49:24 +08:00
rcx f217d6ec5c 发测试 2026-09-09 15:51:57 +08:00
rcx 715883f1d4 feat(oms,wms): 出库业务单反审——已出库/已审核单据回退已创建 
- 新增 POST /reservationStockOutOrderApi/reverseAudit，按issueStatus(2-已审核/4-已出库)判断可反审
- 主单回退已创建并打reverseStatus标记，进【已反审】tab(list status=-2)，重新审核通过自动复位
- 执行单/明细软删+reverseFlag=1，预约库存调整记录软删
- WMS新增/stockOutOrderApi/omsReverseExecutionOrder：已出库还原实物库存+推OMS，未出库仅还原分配占用，WMS无数据幂等成功
- W出库/拣货/复核/交接单软删+reverseFlag=1，列表支持delFlag=2&reverseFlag=1【已反审】tab
- 四页面新增归档详情接口getReverseInfo*
- 生成出库异常记录【反审记录】(abnormalType=3,前缀FSYC)
- 需先执行SQL: 20260908两个反审脚本(OMS库+WMS库)
 2026-09-09 15:20:13 +08:00
rcx 7649585715 发测试 2026-09-09 09:27:57 +08:00
rcx fd3a9afddf 发31 2026-09-08 17:52:42 +08:00
rcx 0358c694ea 发30 2026-09-08 17:46:49 +08:00
rcx 6c6a491ff8 feat(oms/wms): WMS上架状态回传OMS入库业务单，修复入库状态不同步 
- WMS上架推进入库状态后回传OMS(OmsServiceFeign新增returnInResult)
- OMS回传接收加固：无登录上下文判空、已入库同步issueStatus=4
- 已入库联动同步预约入库单(入库业务单)状态
 2026-09-08 13:37:43 +08:00
rcx 06202b652a 发测试 2026-09-08 09:32:47 +08:00
王奎兴 361a91d701 发31 2026-09-07 19:02:39 +08:00
rcx 976ab715af 发30 2026-09-07 18:02:10 +08:00
rcx b6a69411f1 发 测试 2026-09-07 14:25:29 +08:00
王奎兴 625b195183 发测试 2026-09-07 10:21:36 +08:00
王奎兴 0c95470300 Merge branch 'dev-ty1.2' into dev-bms-260826 2026-09-07 10:19:22 +08:00
王奎兴 ba3a540a94 Merge branch 'dev' into dev-bms-260826 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
#	mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
#	mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java
#	mhd_wms/src/main/resources/bootstrap.yml
 2026-09-07 10:00:28 +08:00
王奎兴 a484e81b32 发测试 2026-09-07 09:23:22 +08:00
rcx 627f63cbd3 fix(oms,wms): 入库执行单取消下发完整回退WMS数据，修复重复下发数据致取消阻断 
一、取消下发回退不完整/阻断：原OMS跨库仅软删4张表，收货任务/收货作业单/质检单/电子签名残留；且getWShOrder在重复下发产生多张同号收货单时抛TooManyResultsException，取消下发整体回滚失败。WMS新增/stockInOrderApi/omsCancelInOrder：单事务软删下发链路全部8张表（入库单/明细、收货单/明细、收货任务、收货作业单/明细、质检单），幂等可重试，已开始收货报错拦截；OMS执行单取消下发改调该接口并清理待签名电子签名；预约单取消下发补齐WMS清理

二、下发失败被静默吞掉：omsInOrderAdd/omsInOrderAddDetail原返回void、Feign降级静默，OMS已下发但WMS无数据。改返回AjaxResult、fallback报错，执行单/预约单下发逐一校验返回值，失败回滚下发标记（WMS侧幂等，重下发安全）

三、下发防重原子化：issueOrder下发标记改条件更新(issue_time IS NULL)+影响行数校验，关闭并发/双击重复推送WMS的窗口
 2026-09-07 09:20:37 +08:00
秦鸿展 3c81e37e32 30 2026-09-05 18:39:15 +08:00
王奎兴 10bba6fd9e 物料仓租修改; 2026-09-05 16:59:46 +08:00
王奎兴 4d0ea8522e 发31 2026-09-05 15:52:37 +08:00
王奎兴 700eb3ee95 发30 2026-09-05 15:45:09 +08:00
王奎兴 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
rcx c0065074d3 Merge branch 'dev-ty1.2' into dev 2026-09-05 13:53:01 +08:00
rcx be8ba45067 fix(oms,wms): 出库单下发WMS失败被静默吞掉，修复WMS出库拣货不显示OMS单据 
- 建单/下发前统一校验（数量>0、已关联库存、WMS可用库存），错误汇总一次性提示
- 新增WMS库存校验接口，库存不足在OMS侧拦截不再推送WMS；拦截重复下发
- 检查WMS自动分配/生成拣货单返回值，失败报错并补偿清理WMS残留单据
- 下发状态逐单提交，避免批量部分失败造成两边状态撕裂
- 预约单多仓下发增加逐仓预校验
- 修复取消下发不删拣货单、无库存脏单无法取消两个历史问题
 2026-09-05 13:42:02 +08:00
秦鸿展 b46483263b 31 2026-09-05 10:36:12 +08:00
王奎兴 5a329904c3 正式合同定时任务; 2026-09-04 15:40:19 +08:00
王奎兴 c25a9a5f68 发30 2026-09-04 14:06:48 +08:00
王奎兴 6b3912aae9 发30 2026-09-04 13:59:37 +08:00
王奎兴 77e0c77fbf 发31 2026-09-04 12:21:17 +08:00
王奎兴 ee7dbfcfb9 发30 2026-09-04 11:55:45 +08:00