rcx
5d748a9ac6
fix(oms): 入库业务单新增时用businessType回填单据类型，修复退货单被写成普通入库
2026-09-08 09:28:27 +08:00
王奎兴
361a91d701
发31
2026-09-07 19:02:39 +08:00
王奎兴
3471874139
退货入库;
2026-09-07 18:58:33 +08:00
王奎兴
a38e28bb97
退货入库;
2026-09-07 18:57:51 +08:00
rcx
ab7a4e265f
Merge branch 'dev-ty1.2' into dev
...
# 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 18:03:18 +08:00
rcx
976ab715af
发30
2026-09-07 18:02:10 +08:00
王奎兴
6856899afc
Merge remote-tracking branch 'origin/dev' into dev
2026-09-07 17:23:10 +08:00
王奎兴
6d7be15d97
发31
2026-09-07 17:23:01 +08:00
rcx
0babc7dbf8
Merge remote-tracking branch 'origin/dev' into dev
2026-09-07 17:19:31 +08:00
王奎兴
1a80f715dd
恢复xxl
2026-09-07 17:16:11 +08:00
rcx
7742d11d1c
发31
2026-09-07 17:15:05 +08:00
rcx
c4df9b3403
Merge remote-tracking branch 'origin/dev' into dev
2026-09-07 17:08:20 +08:00
rcx
7ed34df81e
发30
2026-09-07 17:07:16 +08:00
王奎兴
0ace96ea9f
恢复xxl
2026-09-07 17:06:27 +08:00
王奎兴
34014f40a5
Merge branch 'dev-ty1.2' into dev
2026-09-07 16:57:14 +08:00
rcx
acbf7c9fdf
fix: 退货入库单下发时执行入库单类型被固定写成普通入库
2026-09-07 16:56:17 +08:00
rcx
9e1c5d8570
fix(oms): 预约单下发不再推送WMS，修复执行单下发后WMS出现预约单+执行单两张单；三个下发入口补充软删单拦截
2026-09-07 15:44:44 +08:00
秦鸿展
98b5ce81cc
委托方导出功能
2026-09-07 14:28:29 +08:00
rcx
b6a69411f1
发 测试
2026-09-07 14:25:29 +08:00
rcx
34b27eabd2
fix(oms): 出入库导入行级必填校验+页签解析失败完整堆栈日志
...
一、行级必填校验（ReservationStockInOrderImpl）
- 入库导入：新增校验空【產品編號】/空【支/件数】的明细行，给出明确提示
- 出库导入：新增校验空【支/件数】的明细行
- 修复原因：明细行件数为空时 new BigDecimal(null) 抛无信息的 NullPointerException，页面只显示 页签[x]：java.lang.NullPointerException 无法定位
二、页签解析失败完整堆栈日志
- 出/入库多页签解析第一阶段捕获异常时，将完整堆栈打入服务端日志（LOGGER.error），便于远程定位页签内具体报错行号
2026-09-07 14:18:34 +08:00
rcx
1c4b520f5a
Merge remote-tracking branch 'origin/dev-bms-260826' into dev-ty1.2
2026-09-07 13:50:28 +08:00
王奎兴
32459fd443
xxl-job配置；
2026-09-07 11:33:14 +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
王奎兴
f6c454765e
jobid查询接口;
2026-09-05 19:21:17 +08:00
王奎兴
25102b5207
jobid查询接口;
2026-09-05 19:14:34 +08:00
王奎兴
6708353379
jobid查询接口;
2026-09-05 19:08:42 +08:00
王奎兴
20d11dc9b2
jobid查询接口;
2026-09-05 19:00:02 +08:00
王奎兴
fa7db5df0c
jobid查询接口;
2026-09-05 18:52:30 +08:00
王奎兴
cb1a1ec9a6
jobid查询接口;
2026-09-05 18:48:19 +08:00
王奎兴
3abac7b3d6
jobid查询接口;
2026-09-05 18:44:25 +08:00
秦鸿展
3c81e37e32
30
2026-09-05 18:39:15 +08:00
王奎兴
cecfe3e777
jobid查询接口;
2026-09-05 18:28:34 +08:00
王奎兴
104fc8bbef
code
2026-09-05 18:19:25 +08:00
王奎兴
d9e5cede10
code
2026-09-05 17:59:18 +08:00
王奎兴
1689da1911
token
2026-09-05 17:51:37 +08:00
王奎兴
c043da88e4
groupid
2026-09-05 17:41:01 +08:00
王奎兴
d10a81fc42
自动添加xxl任务;
2026-09-05 17:37:33 +08:00
王奎兴
10bba6fd9e
物料仓租修改;
2026-09-05 16:59:46 +08:00
王奎兴
bc09b77695
添加计费字段;
2026-09-05 16:55:10 +08:00
秦鸿展
a7a387f215
南岐GPS接口对接增加字段
2026-09-05 16:29:38 +08:00
王奎兴
4d0ea8522e
发31
2026-09-05 15:52:37 +08:00
王奎兴
700eb3ee95
发30
2026-09-05 15:45:09 +08:00
王奎兴
fd62a7aff5
发31
2026-09-05 15:41:11 +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
秦鸿展
8ddf20f3e7
南岐GPS接口
2026-09-05 14:39:04 +08:00
rcx
王奎兴
秦鸿展