diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 7969bce5f..f6477f04b 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { @@ -34,13 +34,9 @@ public interface OmsServiceFeign { public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail); @ApiOperation("编辑物料库存") - @PostMapping("/reservationMaterialInventoryApi/omsEdit") + @PostMapping("/materialInventoryApi/omsEdit") public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO); - @ApiOperation("库存调整记录插入") - @PostMapping("/reservationInventoryAdjustmentRecordApi/edit") - AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord); - @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据") @GetMapping("/erpEnterpriseUnitApi/unitList") public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 9d5f042a6..e91521a16 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -2123,6 +2123,7 @@ public class UserApplicationService { BeanUtils.copyProperties(userPo, userEntity); + return userPo; }