Commit 355650d4 authored by 温志超's avatar 温志超

更新创建人修改人BUG

parent 9fa3d239
...@@ -7,6 +7,7 @@ import com.ximai.common.core.controller.BaseController; ...@@ -7,6 +7,7 @@ import com.ximai.common.core.controller.BaseController;
import com.ximai.common.core.domain.AjaxResult; import com.ximai.common.core.domain.AjaxResult;
import com.ximai.common.core.page.TableDataInfo; import com.ximai.common.core.page.TableDataInfo;
import com.ximai.common.enums.BusinessType; import com.ximai.common.enums.BusinessType;
import com.ximai.common.utils.SecurityUtils;
import com.ximai.common.utils.data.StringUtils; import com.ximai.common.utils.data.StringUtils;
import com.ximai.common.utils.excel.ExcelWriter; import com.ximai.common.utils.excel.ExcelWriter;
import com.ximai.mes.md.domain.MdWorkshop; import com.ximai.mes.md.domain.MdWorkshop;
...@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -101,6 +103,9 @@ public class MdWorkstationController extends BaseController { ...@@ -101,6 +103,9 @@ public class MdWorkstationController extends BaseController {
return AjaxResult.error("工作站名称已存在!"); return AjaxResult.error("工作站名称已存在!");
} }
String createBy = SecurityUtils.getUsername();
mdWorkstation.setCreateBy(createBy);
mdWorkstation.setCreateTime(new Date());
mdWorkstationService.insertMdWorkstation(mdWorkstation); mdWorkstationService.insertMdWorkstation(mdWorkstation);
// barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_WORKSTATION,mdWorkstation.getWorkstationId(), mdWorkstation.getWorkstationCode(),mdWorkstation.getWorkstationName()); // barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_WORKSTATION,mdWorkstation.getWorkstationId(), mdWorkstation.getWorkstationCode(),mdWorkstation.getWorkstationName());
return AjaxResult.success(mdWorkstation.getWorkstationId()); return AjaxResult.success(mdWorkstation.getWorkstationId());
...@@ -124,7 +129,9 @@ public class MdWorkstationController extends BaseController { ...@@ -124,7 +129,9 @@ public class MdWorkstationController extends BaseController {
if (!StringUtils.isNotNull(workshop)) { if (!StringUtils.isNotNull(workshop)) {
return AjaxResult.error("车间不存在!"); return AjaxResult.error("车间不存在!");
} }
String createBy = SecurityUtils.getUsername();
mdWorkstation.setUpdateBy(createBy);
mdWorkstation.setUpdateTime(new Date());
return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation)); return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment