物料wms模块回滚之前修改

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")

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));