Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ximai
mes
Commits
355650d4
Commit
355650d4
authored
Nov 19, 2024
by
温志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新创建人修改人BUG
parent
9fa3d239
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
443 deletions
+9
-443
MdWorkstationController.java
.../com/ximai/mes/md/controller/MdWorkstationController.java
+8
-1
ProWorkorderController.java
...s/pro/controller/proWorkOrder/ProWorkorderController.java
+1
-442
No files found.
mes/src/main/java/com/ximai/mes/md/controller/MdWorkstationController.java
View file @
355650d4
...
...
@@ -7,6 +7,7 @@ import com.ximai.common.core.controller.BaseController;
import
com.ximai.common.core.domain.AjaxResult
;
import
com.ximai.common.core.page.TableDataInfo
;
import
com.ximai.common.enums.BusinessType
;
import
com.ximai.common.utils.SecurityUtils
;
import
com.ximai.common.utils.data.StringUtils
;
import
com.ximai.common.utils.excel.ExcelWriter
;
import
com.ximai.mes.md.domain.MdWorkshop
;
...
...
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -101,6 +103,9 @@ public class MdWorkstationController extends BaseController {
return
AjaxResult
.
error
(
"工作站名称已存在!"
);
}
String
createBy
=
SecurityUtils
.
getUsername
();
mdWorkstation
.
setCreateBy
(
createBy
);
mdWorkstation
.
setCreateTime
(
new
Date
());
mdWorkstationService
.
insertMdWorkstation
(
mdWorkstation
);
// barCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_WORKSTATION,mdWorkstation.getWorkstationId(), mdWorkstation.getWorkstationCode(),mdWorkstation.getWorkstationName());
return
AjaxResult
.
success
(
mdWorkstation
.
getWorkstationId
());
...
...
@@ -124,7 +129,9 @@ public class MdWorkstationController extends BaseController {
if
(!
StringUtils
.
isNotNull
(
workshop
))
{
return
AjaxResult
.
error
(
"车间不存在!"
);
}
String
createBy
=
SecurityUtils
.
getUsername
();
mdWorkstation
.
setUpdateBy
(
createBy
);
mdWorkstation
.
setUpdateTime
(
new
Date
());
return
toAjax
(
mdWorkstationService
.
updateMdWorkstation
(
mdWorkstation
));
}
...
...
mes/src/main/java/com/ximai/mes/pro/controller/proWorkOrder/ProWorkorderController.java
View file @
355650d4
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment