物料wms模块回滚之前修改
This commit is contained in:
+1
-1
@@ -25,7 +25,7 @@ public class MaterialBaseInfo extends BaseVOEntity {
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@ApiModelProperty("物料基础信息id")
|
@ApiModelProperty("物料基础信息id")
|
||||||
@TableId(type = IdType.ASSIGN_ID)
|
@TableId(type = IdType.INPUT)
|
||||||
private Long materialBaseInfoId;
|
private Long materialBaseInfoId;
|
||||||
|
|
||||||
@ApiModelProperty("组织表ID")
|
@ApiModelProperty("组织表ID")
|
||||||
|
|||||||
+1
-1
@@ -54,7 +54,7 @@ public class MaterialBaseInfoApi extends BaseController {
|
|||||||
{
|
{
|
||||||
//转换实体
|
//转换实体
|
||||||
MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
|
MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
|
||||||
if(materialBaseInfoDTO.getMaterialBaseInfoId() != null){
|
if(1 == materialBaseInfoDTO.getUpdateFeign()){
|
||||||
return toAjax(materialBaseInfoApplicationService.update(materialBaseInfoDO));
|
return toAjax(materialBaseInfoApplicationService.update(materialBaseInfoDO));
|
||||||
}else {
|
}else {
|
||||||
return toAjax(materialBaseInfoApplicationService.insert(materialBaseInfoDO));
|
return toAjax(materialBaseInfoApplicationService.insert(materialBaseInfoDO));
|
||||||
|
|||||||
Reference in New Issue
Block a user