From 1fadbbdec5d53e90980d930bf927ef9d4f27211b Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Mon, 26 Jan 2026 11:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99wms=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B9=8B=E5=89=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java    | 2 +-
 .../facadeApi/materialBaseInfo/MaterialBaseInfoApi.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
index 2006a2cf5..de3f47c7f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
@@ -25,7 +25,7 @@ public class MaterialBaseInfo extends BaseVOEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("物料基础信息id")
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.INPUT)
     private Long materialBaseInfoId;
 
     @ApiModelProperty("组织表ID")
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
index a5d4f788c..3f789154e 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
@@ -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));