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

Merge branch 'dev_lzh_wms_20260120' into wms_dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-01-26 11:18:14 +08:00
parent 985effdaa3 1fadbbdec5
commit b62a8eb7cf
6 changed files with 92 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class MaterialBaseInfoApi extends BaseController {
{
//转换实体
MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
if(materialBaseInfoDTO.getMaterialBaseInfoId() != null){
if(1 == materialBaseInfoDTO.getUpdateFeign()){
return toAjax(materialBaseInfoApplicationService.update(materialBaseInfoDO));
}else {
return toAjax(materialBaseInfoApplicationService.insert(materialBaseInfoDO));