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
parent ec5afcc5bd c2e3de244b
commit 74dbf674b0
46 changed files with 3215 additions and 174 deletions
@@ -536,7 +536,12 @@ public interface WlhyServiceFeign {
     */
    @PostMapping("/feign/order/add")
    public AjaxResult add(@RequestBody TmsOrderAddDTO tmsOrderAddDTO);
-
+    /**
+     * 修改运单(OMS调整业务单后同步修改TMS订单)
+     * @param tmsOrderAddDTO 需携带 TMS 订单 id 定位
+     */
+    @PostMapping("/feign/order/update")
+    public AjaxResult update(@RequestBody TmsOrderAddDTO tmsOrderAddDTO);
    @GetMapping("/feign/order/cancelIssueDocuments")
    public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);

@@ -546,6 +546,11 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
                return AjaxResult.error(cause.getMessage());
            }

+            @Override
+            public AjaxResult update(TmsOrderAddDTO tmsOrderAddDTO) {
+                return AjaxResult.error(cause.getMessage());
+            }
+
            @Override
            public AjaxResult cancelIssueDocuments(String executeOrderId) {
                return AjaxResult.error(cause.getMessage());