weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20260429' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
This commit is contained in:
王奎兴
2026-05-26 08:38:02 +08:00
parent 4b22e56b54 735f7f9113
commit 9a6e544d56
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
+2 -6
View File
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; 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 { public interface OmsServiceFeign {
@@ -34,13 +34,9 @@ public interface OmsServiceFeign {
public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail); public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail);
@ApiOperation("编辑物料库存") @ApiOperation("编辑物料库存")
@PostMapping("/reservationMaterialInventoryApi/omsEdit") @PostMapping("/materialInventoryApi/omsEdit")
public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO); public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
@ApiOperation("库存调整记录插入")
@PostMapping("/reservationInventoryAdjustmentRecordApi/edit")
AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord);
@ApiOperation("查询企业单位列表-新增物料时显示下拉框数据") @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
@GetMapping("/erpEnterpriseUnitApi/unitList") @GetMapping("/erpEnterpriseUnitApi/unitList")
public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO); public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO);
mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
+1
View File
@@ -2123,6 +2123,7 @@ public class UserApplicationService {
BeanUtils.copyProperties(userPo, userEntity); BeanUtils.copyProperties(userPo, userEntity);
return userPo; return userPo;
} }