From 19ab861cd5e25191f9690bcb9cbb095a3b006eba Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Fri, 29 Jan 2021 17:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E6=9B=B4=E6=8D=A2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E5=AE=8C=E6=88=90=20=E6=89=98=E7=9B=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=88=E5=BE=85=E6=B5=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectProductChangeInfoController.java | 83 ++++ .../SelectWorktrayrealtimeinfoController.java | 71 ++++ .../TRpBarcoderelationshipController.java | 126 ++++++ .../TRpProductchangeinfoController.java | 5 +- .../TRpWorktrayhistoryinfoController.java | 64 +-- .../nanjing/TSyTracestateController.java | 126 ++++++ .../BarcodeRelationShip.html | 128 ++++++ .../nanjing/BarcodeRelationShip/add.html | 72 ++++ .../nanjing/BarcodeRelationShip/edit.html | 73 ++++ .../templates/nanjing/LineType/edit.html | 2 +- .../SelectProductChangeInfo.html | 93 +++++ .../nanjing/TraceState/TraceState.html | 182 +++++++++ .../templates/nanjing/TraceState/add.html | 25 ++ .../templates/nanjing/TraceState/edit.html | 26 ++ .../WorkTrayHistoryInfo.html | 123 +++--- .../SelectWorkTrayRealTimeInfo.html | 73 ++++ .../WorkTrayRealTimeInfo.html | 2 +- .../domain/TRpBarcoderelationship.java | 122 ++++++ .../nanjing/domain/TRpProductchangeinfo.java | 18 +- .../ruoyi/nanjing/domain/TRpStationpara.java | 346 ++++++++++++++++ .../domain/TRpWorktrayhistoryinfo.java | 33 ++ .../domain/TRpWorktrayrealtimeinfo.java | 11 + .../ruoyi/nanjing/domain/TSyTracestate.java | 375 ++++++++++++++++++ .../mapper/TRpBarcoderelationshipMapper.java | 61 +++ .../mapper/TRpProductchangeinfoMapper.java | 2 + .../mapper/TRpWorktrayrealtimeinfoMapper.java | 2 + .../nanjing/mapper/TSyTracestateMapper.java | 61 +++ .../ITRpBarcoderelationshipService.java | 61 +++ .../service/ITRpProductchangeinfoService.java | 2 + .../ITRpWorktrayrealtimeinfoService.java | 2 + .../service/ITSyTracestateService.java | 61 +++ .../TRpBarcoderelationshipServiceImpl.java | 94 +++++ .../impl/TRpProductchangeinfoServiceImpl.java | 5 + .../TRpWorktrayrealtimeinfoServiceImpl.java | 5 + .../impl/TSyTracestateServiceImpl.java | 94 +++++ .../nanjing/TRpBarcoderelationshipMapper.xml | 84 ++++ .../nanjing/TRpProductchangeinfoMapper.xml | 21 +- .../nanjing/TRpWorktrayhistoryinfoMapper.xml | 44 +- .../nanjing/TRpWorktrayrealtimeinfoMapper.xml | 8 + .../mapper/nanjing/TSyTracestateMapper.xml | 150 +++++++ 40 files changed, 2791 insertions(+), 145 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpBarcoderelationshipController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyTracestateController.java create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/ProductChangeInfo/SelectProductChangeInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/TraceState/TraceState.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/TraceState/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/TraceState/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpStationpara.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyTracestate.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpBarcoderelationshipMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpBarcoderelationshipService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpBarcoderelationshipServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/TRpBarcoderelationshipMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java new file mode 100644 index 00000000..e5852f33 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProductChangeInfoController.java @@ -0,0 +1,83 @@ +package com.ruoyi.web.controller.nanjing; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import com.ruoyi.nanjing.service.ITBdProductinfoService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.nanjing.domain.TRpProductchangeinfo; +import com.ruoyi.nanjing.service.ITRpProductchangeinfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +import javax.servlet.http.HttpServletRequest; + +/** + * 机种切换管理Controller + * + * @author limy + * @date 2021-01-22 + */ +@Controller +@RequestMapping("/nanjing/SelectProductChangeInfo") +public class SelectProductChangeInfoController extends BaseController +{ + private String prefix = "nanjing/ProductChangeInfo"; + + @Autowired + private ITBdProductinfoService tBdProductinfoService; + @Autowired + private ITRpProductchangeinfoService tRpProductchangeinfoService; + + @RequiresPermissions("nanjing:SelectProductChangeInfo:view") + @GetMapping() + public String ProductChangeInfo(ModelMap map) + { + List tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo()); + map.addAttribute("list",tBdProductinfoList); + return prefix + "/SelectProductChangeInfo"; + } + + /** + * 查询机种切换管理列表 + */ + @RequiresPermissions("nanjing:SelectProductChangeInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TRpProductchangeinfo tRpProductchangeinfo) + { + startPage(); + List list = tRpProductchangeinfoService.selectChangeInfo(tRpProductchangeinfo); + return getDataTable(list); + } + + /** + * 导出机种切换管理列表 + */ + @RequiresPermissions("nanjing:SelectProductChangeInfo:export") + @Log(title = "机种切换管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TRpProductchangeinfo tRpProductchangeinfo) + { + List list = tRpProductchangeinfoService.selectChangeInfo(tRpProductchangeinfo); + ExcelUtil util = new ExcelUtil(TRpProductchangeinfo.class); + return util.exportExcel(list, "SelectProductChangeInfo"); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java new file mode 100644 index 00000000..983081f1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java @@ -0,0 +1,71 @@ +package com.ruoyi.web.controller.nanjing; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.nanjing.domain.TBdSubstation; +import com.ruoyi.nanjing.domain.TRpWorktrayrealtimeinfo; +import com.ruoyi.nanjing.service.ITBdSubstationService; +import com.ruoyi.nanjing.service.ITRpWorktrayrealtimeinfoService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +/** + * 托盘管理Controller + * + * @author limy + * @date 2021-01-28 + */ +@Controller +@RequestMapping("/nanjing/selectWorkTrayRealTimeInfo") +public class SelectWorktrayrealtimeinfoController extends BaseController { + private String prefix = "nanjing/WorkTrayRealTimeInfo"; + + @Autowired + private ITRpWorktrayrealtimeinfoService tRpWorktrayrealtimeinfoService; + @Autowired + private ITBdSubstationService substationService; + @RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:view") + @GetMapping() + public String WorkTrayRealTimeInfo(ModelMap map) { + List substations = substationService.selectTBdSubstationList(new TBdSubstation()); + map.addAttribute("list",substations); + return prefix + "/SelectWorkTrayRealTimeInfo"; + } + + /** + * 查询托盘管理列表 + */ + @RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) { + startPage(); + List list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo); + return getDataTable(list); + } + + /** + * 导出托盘管理列表 + */ + @RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:export") + @Log(title = "托盘管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) { + List list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo); + ExcelUtil util = new ExcelUtil(TRpWorktrayrealtimeinfo.class); + return util.exportExcel(list, "WorkTrayRealTimeInfo"); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpBarcoderelationshipController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpBarcoderelationshipController.java new file mode 100644 index 00000000..206ca80f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpBarcoderelationshipController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.nanjing; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.nanjing.domain.TRpBarcoderelationship; +import com.ruoyi.nanjing.service.ITRpBarcoderelationshipService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * BarcodeRelationShipController + * + * @author limy + * @date 2021-01-29 + */ +@Controller +@RequestMapping("/nanjing/BarcodeRelationShip") +public class TRpBarcoderelationshipController extends BaseController +{ + private String prefix = "nanjing/BarcodeRelationShip"; + + @Autowired + private ITRpBarcoderelationshipService tRpBarcoderelationshipService; + + @RequiresPermissions("nanjing:BarcodeRelationShip:view") + @GetMapping() + public String BarcodeRelationShip() + { + return prefix + "/BarcodeRelationShip"; + } + + /** + * 查询BarcodeRelationShip列表 + */ + @RequiresPermissions("nanjing:BarcodeRelationShip:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TRpBarcoderelationship tRpBarcoderelationship) + { + startPage(); + List list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); + return getDataTable(list); + } + + /** + * 导出BarcodeRelationShip列表 + */ + @RequiresPermissions("nanjing:BarcodeRelationShip:export") + @Log(title = "BarcodeRelationShip", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TRpBarcoderelationship tRpBarcoderelationship) + { + List list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); + ExcelUtil util = new ExcelUtil(TRpBarcoderelationship.class); + return util.exportExcel(list, "BarcodeRelationShip"); + } + + /** + * 新增BarcodeRelationShip + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存BarcodeRelationShip + */ + @RequiresPermissions("nanjing:BarcodeRelationShip:add") + @Log(title = "BarcodeRelationShip", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TRpBarcoderelationship tRpBarcoderelationship) + { + return toAjax(tRpBarcoderelationshipService.insertTRpBarcoderelationship(tRpBarcoderelationship)); + } + + /** + * 修改BarcodeRelationShip + */ + @GetMapping("/edit/{ID}") + public String edit(@PathVariable("ID") Long ID, ModelMap mmap) + { + TRpBarcoderelationship tRpBarcoderelationship = tRpBarcoderelationshipService.selectTRpBarcoderelationshipById(ID); + mmap.put("tRpBarcoderelationship", tRpBarcoderelationship); + return prefix + "/edit"; + } + + /** + * 修改保存BarcodeRelationShip + */ + @RequiresPermissions("nanjing:BarcodeRelationShip:edit") + @Log(title = "BarcodeRelationShip", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TRpBarcoderelationship tRpBarcoderelationship) + { + return toAjax(tRpBarcoderelationshipService.updateTRpBarcoderelationship(tRpBarcoderelationship)); + } + + /** + * 删除BarcodeRelationShip + */ + @RequiresPermissions("nanjing:BarcodeRelationShip:remove") + @Log(title = "BarcodeRelationShip", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tRpBarcoderelationshipService.deleteTRpBarcoderelationshipByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpProductchangeinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpProductchangeinfoController.java index bde1b0f6..f4ff3ec3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpProductchangeinfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpProductchangeinfoController.java @@ -100,6 +100,7 @@ public class TRpProductchangeinfoController extends BaseController @ResponseBody public AjaxResult addSave(TRpProductchangeinfo tRpProductchangeinfo) { + tRpProductchangeinfo.setOperator(Convert.toInt(ShiroUtils.getUserId())); tRpProductchangeinfo.setInsertTime(new Date()); return toAjax(tRpProductchangeinfoService.insertTRpProductchangeinfo(tRpProductchangeinfo)); } @@ -141,7 +142,7 @@ public class TRpProductchangeinfoController extends BaseController TRpProductchangeinfo tRpProductchangeinfo = tRpProductchangeinfoService.selectTRpProductchangeinfoById(Convert.toLong(ids)); if(tRpProductchangeinfo.getBeginTime()==null){ tRpProductchangeinfo.setBeginTime(new Date()); - tRpProductchangeinfo.setOperator(ShiroUtils.getLoginName()); + tRpProductchangeinfo.setOperator(Convert.toInt(ShiroUtils.getUserId())); int res = tRpProductchangeinfoService.updateTRpProductchangeinfo(tRpProductchangeinfo); if(res>0){ msg = "已开始!"; @@ -171,7 +172,7 @@ public class TRpProductchangeinfoController extends BaseController else { tRpProductchangeinfo.setEndTime(new Date()); - tRpProductchangeinfo.setOperator(ShiroUtils.getLoginName()); + tRpProductchangeinfo.setOperator(Convert.toInt(ShiroUtils.getUserId())); int res = tRpProductchangeinfoService.updateTRpProductchangeinfo(tRpProductchangeinfo); if(res>0){ msg = "已结束!"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.java index 60dbb174..f37062c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.nanjing; import java.util.List; + +import com.ruoyi.nanjing.domain.TBdSubstation; +import com.ruoyi.nanjing.service.ITBdSubstationService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,10 +37,13 @@ public class TRpWorktrayhistoryinfoController extends BaseController @Autowired private ITRpWorktrayhistoryinfoService tRpWorktrayhistoryinfoService; + private ITBdSubstationService substationService; @RequiresPermissions("nanjing:WorkTrayHistoryInfo:view") @GetMapping() - public String WorkTrayHistoryInfo() + public String WorkTrayHistoryInfo(ModelMap map) { + List substations = substationService.selectTBdSubstationList(new TBdSubstation()); + map.addAttribute("list",substations); return prefix + "/WorkTrayHistoryInfo"; } @@ -67,60 +73,4 @@ public class TRpWorktrayhistoryinfoController extends BaseController ExcelUtil util = new ExcelUtil(TRpWorktrayhistoryinfo.class); return util.exportExcel(list, "WorkTrayHistoryInfo"); } - - /** - * 新增工位历史生产信息 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存工位历史生产信息 - */ - @RequiresPermissions("nanjing:WorkTrayHistoryInfo:add") - @Log(title = "工位历史生产信息", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) - { - return toAjax(tRpWorktrayhistoryinfoService.insertTRpWorktrayhistoryinfo(tRpWorktrayhistoryinfo)); - } - - /** - * 修改工位历史生产信息 - */ - @GetMapping("/edit/{currentStation}") - public String edit(@PathVariable("currentStation") String currentStation, ModelMap mmap) - { - TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo = tRpWorktrayhistoryinfoService.selectTRpWorktrayhistoryinfoById(currentStation); - mmap.put("tRpWorktrayhistoryinfo", tRpWorktrayhistoryinfo); - return prefix + "/edit"; - } - - /** - * 修改保存工位历史生产信息 - */ - @RequiresPermissions("nanjing:WorkTrayHistoryInfo:edit") - @Log(title = "工位历史生产信息", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) - { - return toAjax(tRpWorktrayhistoryinfoService.updateTRpWorktrayhistoryinfo(tRpWorktrayhistoryinfo)); - } - - /** - * 删除工位历史生产信息 - */ - @RequiresPermissions("nanjing:WorkTrayHistoryInfo:remove") - @Log(title = "工位历史生产信息", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(tRpWorktrayhistoryinfoService.deleteTRpWorktrayhistoryinfoByIds(ids)); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyTracestateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyTracestateController.java new file mode 100644 index 00000000..1b5e84b7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyTracestateController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.nanjing; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.nanjing.domain.TSyTracestate; +import com.ruoyi.nanjing.service.ITSyTracestateService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * traceStateController + * + * @author limy + * @date 2021-01-29 + */ +@Controller +@RequestMapping("/nanjing/TraceState") +public class TSyTracestateController extends BaseController +{ + private String prefix = "nanjing/TraceState"; + + @Autowired + private ITSyTracestateService tSyTracestateService; + + @RequiresPermissions("nanjing:TraceState:view") + @GetMapping() + public String TraceState() + { + return prefix + "/TraceState"; + } + + /** + * 查询traceState列表 + */ + @RequiresPermissions("nanjing:TraceState:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TSyTracestate tSyTracestate) + { + startPage(); + List list = tSyTracestateService.selectTSyTracestateList(tSyTracestate); + return getDataTable(list); + } + + /** + * 导出traceState列表 + */ + @RequiresPermissions("nanjing:TraceState:export") + @Log(title = "traceState", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TSyTracestate tSyTracestate) + { + List list = tSyTracestateService.selectTSyTracestateList(tSyTracestate); + ExcelUtil util = new ExcelUtil(TSyTracestate.class); + return util.exportExcel(list, "TraceState"); + } + + /** + * 新增traceState + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存traceState + */ + @RequiresPermissions("nanjing:TraceState:add") + @Log(title = "traceState", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TSyTracestate tSyTracestate) + { + return toAjax(tSyTracestateService.insertTSyTracestate(tSyTracestate)); + } + + /** + * 修改traceState + */ + @GetMapping("/edit/{barcode}") + public String edit(@PathVariable("barcode") String barcode, ModelMap mmap) + { + TSyTracestate tSyTracestate = tSyTracestateService.selectTSyTracestateById(barcode); + mmap.put("tSyTracestate", tSyTracestate); + return prefix + "/edit"; + } + + /** + * 修改保存traceState + */ + @RequiresPermissions("nanjing:TraceState:edit") + @Log(title = "traceState", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TSyTracestate tSyTracestate) + { + return toAjax(tSyTracestateService.updateTSyTracestate(tSyTracestate)); + } + + /** + * 删除traceState + */ + @RequiresPermissions("nanjing:TraceState:remove") + @Log(title = "traceState", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tSyTracestateService.deleteTSyTracestateByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html new file mode 100644 index 00000000..12e48da7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html @@ -0,0 +1,128 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/add.html new file mode 100644 index 00000000..ac0a0013 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/add.html @@ -0,0 +1,72 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/edit.html new file mode 100644 index 00000000..6f7b77f4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/edit.html @@ -0,0 +1,73 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/LineType/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/LineType/edit.html index 48eb1045..916206ad 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/LineType/edit.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/LineType/edit.html @@ -13,7 +13,7 @@ -
+
+ - + + +
  • + + +
    • +
  • +  搜索 +  查询全部 + 导出 +
    • + +
    + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/TraceState.html b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/TraceState.html new file mode 100644 index 00000000..063af5b7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/TraceState.html @@ -0,0 +1,182 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/add.html new file mode 100644 index 00000000..76f618c3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/edit.html new file mode 100644 index 00000000..8e9460e8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/TraceState/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html index 45b8a51d..e463b7d6 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html @@ -10,53 +10,45 @@
      -
    • - - -
      • -
    • - - -
      • -
    • - - +
    • + + + - +
    • - - + +
      • -
    • - - - - - +
    • + +
    •  搜索 -  重置 +  查询全部 + 导出
    -
    - - 添加 - - - 修改 - - - 删除 - - - 导出 - +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • @@ -73,47 +65,34 @@ $(function() { var options = { url: prefix + "/list", - createUrl: prefix + "/add", - updateUrl: prefix + "/edit/{id}", - removeUrl: prefix + "/remove", exportUrl: prefix + "/export", modalName: "工位历史生产信息", - columns: [{ - checkbox: true - }, - { - field: 'currentStation', - title: '当前工位' - }, - { - field: 'barCode', - title: '系统条码' - }, - { - field: 'rfidNum', - title: 'RFID条码' - }, - { - field: 'state', - title: '质量品级', - formatter: function(value, row, index) { - return $.table.selectDictLabel(stateDatas, value); - } - }, - { - field: 'updateTime', - title: '更新时间' - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); + columns: [ + { + field: 'substation.StationCode', + title: '工位码' + }, + { + field: 'stationpara.rfidNO', + title: '托盘条码' + }, + { + field: 'stationpara.barcode', + title: '系统条码' + }, + { + field: 'barcoderelationship.productBarcode', + title: '部件码' + }, + { + field: 'stationpara.state', + title: '状态' + }, + { + field: 'stationpara.insertTime', + title: '记录时间' } - }] + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html new file mode 100644 index 00000000..1b7057be --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/SelectWorkTrayRealTimeInfo.html @@ -0,0 +1,73 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html index ba33fc7f..fee5e3a6 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html @@ -25,7 +25,7 @@  搜索  重置 添加 - 导出 +
    diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java new file mode 100644 index 00000000..085c2887 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java @@ -0,0 +1,122 @@ +package com.ruoyi.nanjing.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * BarcodeRelationShip对象 T_RP_BarcodeRelationShip + * + * @author limy + * @date 2021-01-29 + */ +public class TRpBarcoderelationship extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long ID; + + /** Semi */ + @Excel(name = "Semi") + private String semiBarcode; + + /** 产品条码 */ + @Excel(name = "产品条码") + private String productBarcode; + + /** 支线条码 */ + @Excel(name = "支线条码") + private String semibarcodeLine; + + /** 所属支线ID */ + @Excel(name = "所属支线ID") + private Long lineID; + + /** 是否生效 */ + @Excel(name = "是否生效") + private String stateFlag; + + /** 记录时间 */ + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date insertTime; + + public void setID(Long ID) + { + this.ID = ID; + } + + public Long getID() + { + return ID; + } + public void setSemiBarcode(String semiBarcode) + { + this.semiBarcode = semiBarcode; + } + + public String getSemiBarcode() + { + return semiBarcode; + } + public void setProductBarcode(String productBarcode) + { + this.productBarcode = productBarcode; + } + + public String getProductBarcode() + { + return productBarcode; + } + public void setSemibarcodeLine(String semibarcodeLine) + { + this.semibarcodeLine = semibarcodeLine; + } + + public String getSemibarcodeLine() + { + return semibarcodeLine; + } + public void setLineID(Long lineID) + { + this.lineID = lineID; + } + + public Long getLineID() + { + return lineID; + } + public void setStateFlag(String stateFlag) + { + this.stateFlag = stateFlag; + } + + public String getStateFlag() + { + return stateFlag; + } + public void setInsertTime(Date insertTime) + { + this.insertTime = insertTime; + } + + public Date getInsertTime() + { + return insertTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("ID", getID()) + .append("semiBarcode", getSemiBarcode()) + .append("productBarcode", getProductBarcode()) + .append("semibarcodeLine", getSemibarcodeLine()) + .append("lineID", getLineID()) + .append("stateFlag", getStateFlag()) + .append("insertTime", getInsertTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpProductchangeinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpProductchangeinfo.java index 6353012f..76bccdd4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpProductchangeinfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpProductchangeinfo.java @@ -1,6 +1,8 @@ package com.ruoyi.nanjing.domain; import java.util.Date; + +import com.ruoyi.system.domain.SysUser; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -45,8 +47,18 @@ public class TRpProductchangeinfo extends BaseEntity private TBdProductinfo tBdProductinfo; + public SysUser getUser() { + return user; + } + + public void setUser(SysUser user) { + this.user = user; + } + + private SysUser user; + /** 操作员 */ - private String Operator; + private int Operator; /** 插入时间 */ private Date InsertTime; @@ -96,12 +108,12 @@ public class TRpProductchangeinfo extends BaseEntity { return EndTime; } - public void setOperator(String Operator) + public void setOperator(int Operator) { this.Operator = Operator; } - public String getOperator() + public int getOperator() { return Operator; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpStationpara.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpStationpara.java new file mode 100644 index 00000000..2603d7b8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpStationpara.java @@ -0,0 +1,346 @@ +package com.ruoyi.nanjing.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * ParameterList对象 T_RP_StationPara_OP10 + * + * @author limy + * @date 2021-01-29 + */ +public class TRpStationpara extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 系统条码 */ + @Excel(name = "系统条码") + private String barcode; + + /** SemiBarcode */ + @Excel(name = "SemiBarcode") + private String semiBarcode; + + /** ScanBarcode */ + @Excel(name = "ScanBarcode") + private String scanBarcode; + + /** rfid */ + @Excel(name = "rfid") + private String rfidNO; + + /** 班次 */ + @Excel(name = "班次") + private String shiftNo; + + /** 工位ID */ + @Excel(name = "工位ID") + private String stationID; + + /** 机台ID */ + @Excel(name = "机台ID") + private String machineID; + + /** MaskID */ + @Excel(name = "MaskID") + private String maskID; + + /** 记录时间 */ + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date insertTime; + + /** 上传标志 */ + @Excel(name = "上传标志") + private String uploadFlag; + + /** 结束标志 */ + @Excel(name = "结束标志") + private String finalFlag; + + /** 状态 */ + @Excel(name = "状态") + private String state; + + /** 参数1 */ + @Excel(name = "参数1") + private String para1; + + /** 参数1最小值 */ + @Excel(name = "参数1最小值") + private String para1Min; + + /** 参数1最大值 */ + @Excel(name = "参数1最大值") + private String para1Max; + + /** 参数1状态 */ + @Excel(name = "参数1状态") + private String para1State; + + /** 参数1保留 */ + @Excel(name = "参数1保留") + private String para1Reserve; + + /** 参数2 */ + @Excel(name = "参数2") + private String para2; + + /** 参数2最小值 */ + @Excel(name = "参数2最小值") + private String para2Min; + + /** 参数2最大值 */ + @Excel(name = "参数2最大值") + private String para2Max; + + /** 参数2状态 */ + @Excel(name = "参数2状态") + private String para2State; + + /** 参数2保留 */ + @Excel(name = "参数2保留") + private String para2Reserve; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setBarcode(String barcode) + { + this.barcode = barcode; + } + + public String getBarcode() + { + return barcode; + } + public void setSemiBarcode(String semiBarcode) + { + this.semiBarcode = semiBarcode; + } + + public String getSemiBarcode() + { + return semiBarcode; + } + public void setScanBarcode(String scanBarcode) + { + this.scanBarcode = scanBarcode; + } + + public String getScanBarcode() + { + return scanBarcode; + } + public void setRfidNO(String rfidNO) + { + this.rfidNO = rfidNO; + } + + public String getRfidNO() + { + return rfidNO; + } + public void setShiftNo(String shiftNo) + { + this.shiftNo = shiftNo; + } + + public String getShiftNo() + { + return shiftNo; + } + public void setStationID(String stationID) + { + this.stationID = stationID; + } + + public String getStationID() + { + return stationID; + } + public void setMachineID(String machineID) + { + this.machineID = machineID; + } + + public String getMachineID() + { + return machineID; + } + public void setMaskID(String maskID) + { + this.maskID = maskID; + } + + public String getMaskID() + { + return maskID; + } + public void setInsertTime(Date insertTime) + { + this.insertTime = insertTime; + } + + public Date getInsertTime() + { + return insertTime; + } + public void setUploadFlag(String uploadFlag) + { + this.uploadFlag = uploadFlag; + } + + public String getUploadFlag() + { + return uploadFlag; + } + public void setFinalFlag(String finalFlag) + { + this.finalFlag = finalFlag; + } + + public String getFinalFlag() + { + return finalFlag; + } + public void setState(String state) + { + this.state = state; + } + + public String getState() + { + return state; + } + public void setPara1(String para1) + { + this.para1 = para1; + } + + public String getPara1() + { + return para1; + } + public void setPara1Min(String para1Min) + { + this.para1Min = para1Min; + } + + public String getPara1Min() + { + return para1Min; + } + public void setPara1Max(String para1Max) + { + this.para1Max = para1Max; + } + + public String getPara1Max() + { + return para1Max; + } + public void setPara1State(String para1State) + { + this.para1State = para1State; + } + + public String getPara1State() + { + return para1State; + } + public void setPara1Reserve(String para1Reserve) + { + this.para1Reserve = para1Reserve; + } + + public String getPara1Reserve() + { + return para1Reserve; + } + public void setPara2(String para2) + { + this.para2 = para2; + } + + public String getPara2() + { + return para2; + } + public void setPara2Min(String para2Min) + { + this.para2Min = para2Min; + } + + public String getPara2Min() + { + return para2Min; + } + public void setPara2Max(String para2Max) + { + this.para2Max = para2Max; + } + + public String getPara2Max() + { + return para2Max; + } + public void setPara2State(String para2State) + { + this.para2State = para2State; + } + + public String getPara2State() + { + return para2State; + } + public void setPara2Reserve(String para2Reserve) + { + this.para2Reserve = para2Reserve; + } + + public String getPara2Reserve() + { + return para2Reserve; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("barcode", getBarcode()) + .append("semiBarcode", getSemiBarcode()) + .append("scanBarcode", getScanBarcode()) + .append("rfidNO", getRfidNO()) + .append("shiftNo", getShiftNo()) + .append("stationID", getStationID()) + .append("machineID", getMachineID()) + .append("maskID", getMaskID()) + .append("insertTime", getInsertTime()) + .append("uploadFlag", getUploadFlag()) + .append("finalFlag", getFinalFlag()) + .append("state", getState()) + .append("para1", getPara1()) + .append("para1Min", getPara1Min()) + .append("para1Max", getPara1Max()) + .append("para1State", getPara1State()) + .append("para1Reserve", getPara1Reserve()) + .append("para2", getPara2()) + .append("para2Min", getPara2Min()) + .append("para2Max", getPara2Max()) + .append("para2State", getPara2State()) + .append("para2Reserve", getPara2Reserve()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java index b352de8b..8f15a4e5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java @@ -31,6 +31,39 @@ public class TRpWorktrayhistoryinfo extends BaseEntity @Excel(name = "质量品级") private String state; + @Excel(name = "工位码") + private TBdSubstation substation; + + @Excel(name = "产品码") + private TRpBarcoderelationship barcoderelationship; + + private TRpStationpara stationpara; + + public TRpStationpara getStationpara() { + return stationpara; + } + + public void setStationpara(TRpStationpara stationpara) { + this.stationpara = stationpara; + } + + public TBdSubstation getSubstation() { + return substation; + } + + public void setSubstation(TBdSubstation substation) { + this.substation = substation; + } + + public TRpBarcoderelationship getBarcoderelationship() { + return barcoderelationship; + } + + public void setBarcoderelationship(TRpBarcoderelationship barcoderelationship) { + this.barcoderelationship = barcoderelationship; + } + + public void setCurrentStation(String currentStation) { this.currentStation = currentStation; diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java index c6974572..06f82fa1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java @@ -46,6 +46,17 @@ public class TRpWorktrayrealtimeinfo extends BaseEntity @Excel(name = "停用时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deleteTime; + + private TRpBarcoderelationship barcoderelationship; + + public TRpBarcoderelationship getBarcoderelationship() { + return barcoderelationship; + } + + public void setBarcoderelationship(TRpBarcoderelationship barcoderelationship) { + this.barcoderelationship = barcoderelationship; + } + public void setRfidNum(String rfidNum) { this.rfidNum = rfidNum; diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyTracestate.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyTracestate.java new file mode 100644 index 00000000..f87db860 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TSyTracestate.java @@ -0,0 +1,375 @@ +package com.ruoyi.nanjing.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * traceState对象 T_SY_TraceState + * + * @author limy + * @date 2021-01-29 + */ +public class TSyTracestate extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + @Excel(name = "null") + private String barcode; + + /** 产品ID */ + @Excel(name = "产品ID") + private String productID; + + /** 开始时间 */ + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date beginTime; + + /** 结束时间 */ + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 班次ID */ + @Excel(name = "班次ID") + private String shiftID; + + /** 班组ID */ + @Excel(name = "班组ID") + private String groupID; + + /** 班次号 */ + @Excel(name = "班次号") + private String shiftNo; + + /** 条码A */ + @Excel(name = "条码A") + private String semibarcodeA; + + /** 条码B */ + @Excel(name = "条码B") + private String semibarcodeB; + + /** 条码C */ + @Excel(name = "条码C") + private String semibarcodeC; + + /** 产品码 */ + @Excel(name = "产品码") + private String productBarcode; + + /** SemiBarcode2 */ + @Excel(name = "SemiBarcode2") + private String semiBarcode2; + + /** shellbarcode */ + @Excel(name = "shellbarcode") + private String shellbarcode; + + /** NameplateInfo */ + @Excel(name = "NameplateInfo") + private String nameplateInfo; + + /** MarkRecord */ + @Excel(name = "MarkRecord") + private String markRecord; + + /** 属性1 */ + @Excel(name = "属性1") + private String attr1; + + /** 属性2 */ + @Excel(name = "属性2") + private String attr2; + + /** 拆解状态 */ + @Excel(name = "拆解状态") + private String isDis; + + /** 拆解操作人 */ + @Excel(name = "拆解操作人") + private String disChecker; + + /** 拆解时间 */ + @Excel(name = "拆解时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date disTime; + + /** 合格状态 */ + @Excel(name = "合格状态") + private String state; + + /** 当前工位 */ + @Excel(name = "当前工位") + private String currentStationID; + + /** NG工位 */ + @Excel(name = "NG工位") + private String nGStationID; + + /** 完成状态 */ + @Excel(name = "完成状态") + private String finishFlag; + + /** 不合格原因 */ + @Excel(name = "不合格原因") + private String d9Remark; + + public void setBarcode(String barcode) + { + this.barcode = barcode; + } + + public String getBarcode() + { + return barcode; + } + public void setProductID(String productID) + { + this.productID = productID; + } + + public String getProductID() + { + return productID; + } + public void setBeginTime(Date beginTime) + { + this.beginTime = beginTime; + } + + public Date getBeginTime() + { + return beginTime; + } + public void setEndTime(Date endTime) + { + this.endTime = endTime; + } + + public Date getEndTime() + { + return endTime; + } + public void setShiftID(String shiftID) + { + this.shiftID = shiftID; + } + + public String getShiftID() + { + return shiftID; + } + public void setGroupID(String groupID) + { + this.groupID = groupID; + } + + public String getGroupID() + { + return groupID; + } + public void setShiftNo(String shiftNo) + { + this.shiftNo = shiftNo; + } + + public String getShiftNo() + { + return shiftNo; + } + public void setSemibarcodeA(String semibarcodeA) + { + this.semibarcodeA = semibarcodeA; + } + + public String getSemibarcodeA() + { + return semibarcodeA; + } + public void setSemibarcodeB(String semibarcodeB) + { + this.semibarcodeB = semibarcodeB; + } + + public String getSemibarcodeB() + { + return semibarcodeB; + } + public void setSemibarcodeC(String semibarcodeC) + { + this.semibarcodeC = semibarcodeC; + } + + public String getSemibarcodeC() + { + return semibarcodeC; + } + public void setProductBarcode(String productBarcode) + { + this.productBarcode = productBarcode; + } + + public String getProductBarcode() + { + return productBarcode; + } + public void setSemiBarcode2(String semiBarcode2) + { + this.semiBarcode2 = semiBarcode2; + } + + public String getSemiBarcode2() + { + return semiBarcode2; + } + public void setShellbarcode(String shellbarcode) + { + this.shellbarcode = shellbarcode; + } + + public String getShellbarcode() + { + return shellbarcode; + } + public void setNameplateInfo(String nameplateInfo) + { + this.nameplateInfo = nameplateInfo; + } + + public String getNameplateInfo() + { + return nameplateInfo; + } + public void setMarkRecord(String markRecord) + { + this.markRecord = markRecord; + } + + public String getMarkRecord() + { + return markRecord; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setIsDis(String isDis) + { + this.isDis = isDis; + } + + public String getIsDis() + { + return isDis; + } + public void setDisChecker(String disChecker) + { + this.disChecker = disChecker; + } + + public String getDisChecker() + { + return disChecker; + } + public void setDisTime(Date disTime) + { + this.disTime = disTime; + } + + public Date getDisTime() + { + return disTime; + } + public void setState(String state) + { + this.state = state; + } + + public String getState() + { + return state; + } + public void setCurrentStationID(String currentStationID) + { + this.currentStationID = currentStationID; + } + + public String getCurrentStationID() + { + return currentStationID; + } + public void setnGStationID(String nGStationID) + { + this.nGStationID = nGStationID; + } + + public String getnGStationID() + { + return nGStationID; + } + public void setFinishFlag(String finishFlag) + { + this.finishFlag = finishFlag; + } + + public String getFinishFlag() + { + return finishFlag; + } + public void setD9Remark(String d9Remark) + { + this.d9Remark = d9Remark; + } + + public String getD9Remark() + { + return d9Remark; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("barcode", getBarcode()) + .append("productID", getProductID()) + .append("beginTime", getBeginTime()) + .append("endTime", getEndTime()) + .append("shiftID", getShiftID()) + .append("groupID", getGroupID()) + .append("shiftNo", getShiftNo()) + .append("semibarcodeA", getSemibarcodeA()) + .append("semibarcodeB", getSemibarcodeB()) + .append("semibarcodeC", getSemibarcodeC()) + .append("productBarcode", getProductBarcode()) + .append("semiBarcode2", getSemiBarcode2()) + .append("shellbarcode", getShellbarcode()) + .append("nameplateInfo", getNameplateInfo()) + .append("markRecord", getMarkRecord()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("isDis", getIsDis()) + .append("disChecker", getDisChecker()) + .append("disTime", getDisTime()) + .append("state", getState()) + .append("currentStationID", getCurrentStationID()) + .append("nGStationID", getnGStationID()) + .append("finishFlag", getFinishFlag()) + .append("d9Remark", getD9Remark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpBarcoderelationshipMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpBarcoderelationshipMapper.java new file mode 100644 index 00000000..810450f7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpBarcoderelationshipMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpBarcoderelationship; + +/** + * BarcodeRelationShipMapper接口 + * + * @author limy + * @date 2021-01-29 + */ +public interface TRpBarcoderelationshipMapper +{ + /** + * 查询BarcodeRelationShip + * + * @param ID BarcodeRelationShipID + * @return BarcodeRelationShip + */ + public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID); + + /** + * 查询BarcodeRelationShip列表 + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return BarcodeRelationShip集合 + */ + public List selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 新增BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 修改BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 删除BarcodeRelationShip + * + * @param ID BarcodeRelationShipID + * @return 结果 + */ + public int deleteTRpBarcoderelationshipById(Long ID); + + /** + * 批量删除BarcodeRelationShip + * + * @param IDs 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpBarcoderelationshipByIds(String[] IDs); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpProductchangeinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpProductchangeinfoMapper.java index 6f49cb22..a23b8ae6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpProductchangeinfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpProductchangeinfoMapper.java @@ -58,4 +58,6 @@ public interface TRpProductchangeinfoMapper * @return 结果 */ public int deleteTRpProductchangeinfoByIds(String[] IDs); + + List selectChangeInfo(TRpProductchangeinfo tRpProductchangeinfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java index c5e73c98..625d96c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java @@ -58,4 +58,6 @@ public interface TRpWorktrayrealtimeinfoMapper * @return 结果 */ public int deleteTRpWorktrayrealtimeinfoByIds(String[] rfidNums); + + List selectrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java new file mode 100644 index 00000000..f919ab76 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.TSyTracestate; + +/** + * traceStateMapper接口 + * + * @author limy + * @date 2021-01-29 + */ +public interface TSyTracestateMapper +{ + /** + * 查询traceState + * + * @param barcode traceStateID + * @return traceState + */ + public TSyTracestate selectTSyTracestateById(String barcode); + + /** + * 查询traceState列表 + * + * @param tSyTracestate traceState + * @return traceState集合 + */ + public List selectTSyTracestateList(TSyTracestate tSyTracestate); + + /** + * 新增traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + public int insertTSyTracestate(TSyTracestate tSyTracestate); + + /** + * 修改traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + public int updateTSyTracestate(TSyTracestate tSyTracestate); + + /** + * 删除traceState + * + * @param barcode traceStateID + * @return 结果 + */ + public int deleteTSyTracestateById(String barcode); + + /** + * 批量删除traceState + * + * @param barcodes 需要删除的数据ID + * @return 结果 + */ + public int deleteTSyTracestateByIds(String[] barcodes); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpBarcoderelationshipService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpBarcoderelationshipService.java new file mode 100644 index 00000000..b2a2c3b5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpBarcoderelationshipService.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpBarcoderelationship; + +/** + * BarcodeRelationShipService接口 + * + * @author limy + * @date 2021-01-29 + */ +public interface ITRpBarcoderelationshipService +{ + /** + * 查询BarcodeRelationShip + * + * @param ID BarcodeRelationShipID + * @return BarcodeRelationShip + */ + public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID); + + /** + * 查询BarcodeRelationShip列表 + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return BarcodeRelationShip集合 + */ + public List selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 新增BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 修改BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship); + + /** + * 批量删除BarcodeRelationShip + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpBarcoderelationshipByIds(String ids); + + /** + * 删除BarcodeRelationShip信息 + * + * @param ID BarcodeRelationShipID + * @return 结果 + */ + public int deleteTRpBarcoderelationshipById(Long ID); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpProductchangeinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpProductchangeinfoService.java index c789cde9..1abec147 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpProductchangeinfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpProductchangeinfoService.java @@ -58,4 +58,6 @@ public interface ITRpProductchangeinfoService * @return 结果 */ public int deleteTRpProductchangeinfoById(Long ID); + + List selectChangeInfo(TRpProductchangeinfo tRpProductchangeinfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java index 78d1a882..e19ee3cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java @@ -58,4 +58,6 @@ public interface ITRpWorktrayrealtimeinfoService * @return 结果 */ public int deleteTRpWorktrayrealtimeinfoById(String rfidNum); + + List selectrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java new file mode 100644 index 00000000..2b3755ac --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyTracestateService.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.TSyTracestate; + +/** + * traceStateService接口 + * + * @author limy + * @date 2021-01-29 + */ +public interface ITSyTracestateService +{ + /** + * 查询traceState + * + * @param barcode traceStateID + * @return traceState + */ + public TSyTracestate selectTSyTracestateById(String barcode); + + /** + * 查询traceState列表 + * + * @param tSyTracestate traceState + * @return traceState集合 + */ + public List selectTSyTracestateList(TSyTracestate tSyTracestate); + + /** + * 新增traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + public int insertTSyTracestate(TSyTracestate tSyTracestate); + + /** + * 修改traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + public int updateTSyTracestate(TSyTracestate tSyTracestate); + + /** + * 批量删除traceState + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTSyTracestateByIds(String ids); + + /** + * 删除traceState信息 + * + * @param barcode traceStateID + * @return 结果 + */ + public int deleteTSyTracestateById(String barcode); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpBarcoderelationshipServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpBarcoderelationshipServiceImpl.java new file mode 100644 index 00000000..8b4858b6 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpBarcoderelationshipServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.TRpBarcoderelationshipMapper; +import com.ruoyi.nanjing.domain.TRpBarcoderelationship; +import com.ruoyi.nanjing.service.ITRpBarcoderelationshipService; +import com.ruoyi.common.core.text.Convert; + +/** + * BarcodeRelationShipService业务层处理 + * + * @author limy + * @date 2021-01-29 + */ +@Service +public class TRpBarcoderelationshipServiceImpl implements ITRpBarcoderelationshipService +{ + @Autowired + private TRpBarcoderelationshipMapper tRpBarcoderelationshipMapper; + + /** + * 查询BarcodeRelationShip + * + * @param ID BarcodeRelationShipID + * @return BarcodeRelationShip + */ + @Override + public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID) + { + return tRpBarcoderelationshipMapper.selectTRpBarcoderelationshipById(ID); + } + + /** + * 查询BarcodeRelationShip列表 + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return BarcodeRelationShip + */ + @Override + public List selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship) + { + return tRpBarcoderelationshipMapper.selectTRpBarcoderelationshipList(tRpBarcoderelationship); + } + + /** + * 新增BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + @Override + public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship) + { + return tRpBarcoderelationshipMapper.insertTRpBarcoderelationship(tRpBarcoderelationship); + } + + /** + * 修改BarcodeRelationShip + * + * @param tRpBarcoderelationship BarcodeRelationShip + * @return 结果 + */ + @Override + public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship) + { + return tRpBarcoderelationshipMapper.updateTRpBarcoderelationship(tRpBarcoderelationship); + } + + /** + * 删除BarcodeRelationShip对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTRpBarcoderelationshipByIds(String ids) + { + return tRpBarcoderelationshipMapper.deleteTRpBarcoderelationshipByIds(Convert.toStrArray(ids)); + } + + /** + * 删除BarcodeRelationShip信息 + * + * @param ID BarcodeRelationShipID + * @return 结果 + */ + @Override + public int deleteTRpBarcoderelationshipById(Long ID) + { + return tRpBarcoderelationshipMapper.deleteTRpBarcoderelationshipById(ID); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpProductchangeinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpProductchangeinfoServiceImpl.java index b3055938..7c3fb831 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpProductchangeinfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpProductchangeinfoServiceImpl.java @@ -91,4 +91,9 @@ public class TRpProductchangeinfoServiceImpl implements ITRpProductchangeinfoSer { return tRpProductchangeinfoMapper.deleteTRpProductchangeinfoById(ID); } + + @Override + public List selectChangeInfo(TRpProductchangeinfo tRpProductchangeinfo) { + return tRpProductchangeinfoMapper.selectChangeInfo(tRpProductchangeinfo); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java index 57ee116d..1319b203 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java @@ -93,4 +93,9 @@ public class TRpWorktrayrealtimeinfoServiceImpl implements ITRpWorktrayrealtimei { return tRpWorktrayrealtimeinfoMapper.deleteTRpWorktrayrealtimeinfoById(rfidNum); } + + @Override + public List selectrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) { + return tRpWorktrayrealtimeinfoMapper.selectrealtimeinfoList(tRpWorktrayrealtimeinfo); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java new file mode 100644 index 00000000..afac644d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyTracestateServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.TSyTracestateMapper; +import com.ruoyi.nanjing.domain.TSyTracestate; +import com.ruoyi.nanjing.service.ITSyTracestateService; +import com.ruoyi.common.core.text.Convert; + +/** + * traceStateService业务层处理 + * + * @author limy + * @date 2021-01-29 + */ +@Service +public class TSyTracestateServiceImpl implements ITSyTracestateService +{ + @Autowired + private TSyTracestateMapper tSyTracestateMapper; + + /** + * 查询traceState + * + * @param barcode traceStateID + * @return traceState + */ + @Override + public TSyTracestate selectTSyTracestateById(String barcode) + { + return tSyTracestateMapper.selectTSyTracestateById(barcode); + } + + /** + * 查询traceState列表 + * + * @param tSyTracestate traceState + * @return traceState + */ + @Override + public List selectTSyTracestateList(TSyTracestate tSyTracestate) + { + return tSyTracestateMapper.selectTSyTracestateList(tSyTracestate); + } + + /** + * 新增traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + @Override + public int insertTSyTracestate(TSyTracestate tSyTracestate) + { + return tSyTracestateMapper.insertTSyTracestate(tSyTracestate); + } + + /** + * 修改traceState + * + * @param tSyTracestate traceState + * @return 结果 + */ + @Override + public int updateTSyTracestate(TSyTracestate tSyTracestate) + { + return tSyTracestateMapper.updateTSyTracestate(tSyTracestate); + } + + /** + * 删除traceState对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTSyTracestateByIds(String ids) + { + return tSyTracestateMapper.deleteTSyTracestateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除traceState信息 + * + * @param barcode traceStateID + * @return 结果 + */ + @Override + public int deleteTSyTracestateById(String barcode) + { + return tSyTracestateMapper.deleteTSyTracestateById(barcode); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpBarcoderelationshipMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpBarcoderelationshipMapper.xml new file mode 100644 index 00000000..31c9b2be --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpBarcoderelationshipMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + select ID, SemiBarcode, ProductBarcode, SemiBarcode_Line, LineID, StateFlag, InsertTime from T_RP_BarcodeRelationShip + + + + + + + + insert into T_RP_BarcodeRelationShip + + ID, + SemiBarcode, + ProductBarcode, + SemiBarcode_Line, + LineID, + StateFlag, + InsertTime, + + + #{ID}, + #{semiBarcode}, + #{productBarcode}, + #{semibarcodeLine}, + #{lineID}, + #{stateFlag}, + #{insertTime}, + + + + + update T_RP_BarcodeRelationShip + + SemiBarcode = #{semiBarcode}, + ProductBarcode = #{productBarcode}, + SemiBarcode_Line = #{semibarcodeLine}, + LineID = #{lineID}, + StateFlag = #{stateFlag}, + InsertTime = #{insertTime}, + + where ID = #{ID} + + + + delete from T_RP_BarcodeRelationShip where ID = #{ID} + + + + delete from T_RP_BarcodeRelationShip where ID in + + #{ID} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpProductchangeinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpProductchangeinfoMapper.xml index fb9f3a10..291b0234 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TRpProductchangeinfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpProductchangeinfoMapper.xml @@ -13,14 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select t1.ID, t1.ProductId,t2.ProductName, t1.PersonInCharge, t1.BeginTime, t1.EndTime, t1.Operator, t1.InsertTime from T_RP_ProductChangeInfo t1 + select t1.ID, t1.ProductId,t2.ProductName, t1.PersonInCharge, t1.BeginTime, t1.EndTime, t1.Operator, t1.InsertTime, t3.user_name from T_RP_ProductChangeInfo t1 left join T_BD_ProductInfo t2 on t1.ProductId = t2.ProductID + left join sys_user t3 on t1.Operator = Convert(varchar, t3.user_id) + + insert into T_RP_ProductChangeInfo diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml index 4bc6f228..3bc61a14 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml @@ -10,20 +10,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + - select CurrentStation, barCode, RFIDNum, State, updateTime from T_RP_WorkTrayHistoryInfo + select * from T_RP_WorkTrayHistoryInfo - diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml index a1fa4c19..31ff1f85 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml @@ -14,8 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + select RFIDNum, barCode, SemiBarcode, CurrentStation, State, updateTime, UsedFlag, InsertTime, DeleteTime from T_RP_WorkTrayRealTimeInfo @@ -33,6 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where RFIDNum = #{rfidNum} + + insert into T_RP_WorkTrayRealTimeInfo diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml new file mode 100644 index 00000000..de2c3f50 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TSyTracestateMapper.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select Barcode, ProductID, BeginTime, EndTime, ShiftID, GroupID, ShiftNo, SemiBarcode_A, SemiBarcode_B, SemiBarcode_C, ProductBarcode, SemiBarcode2, shellbarcode, NameplateInfo, MarkRecord, Attr1, Attr2, ISDis, DisChecker, DisTime, State, CurrentStationID, NGStationID, FinishFlag, D9Remark from T_SY_TraceState + + + + + + + + insert into T_SY_TraceState + + Barcode, + ProductID, + BeginTime, + EndTime, + ShiftID, + GroupID, + ShiftNo, + SemiBarcode_A, + SemiBarcode_B, + SemiBarcode_C, + ProductBarcode, + SemiBarcode2, + shellbarcode, + NameplateInfo, + MarkRecord, + Attr1, + Attr2, + ISDis, + DisChecker, + DisTime, + State, + CurrentStationID, + NGStationID, + FinishFlag, + D9Remark, + + + #{barcode}, + #{productID}, + #{beginTime}, + #{endTime}, + #{shiftID}, + #{groupID}, + #{shiftNo}, + #{semibarcodeA}, + #{semibarcodeB}, + #{semibarcodeC}, + #{productBarcode}, + #{semiBarcode2}, + #{shellbarcode}, + #{nameplateInfo}, + #{markRecord}, + #{attr1}, + #{attr2}, + #{isDis}, + #{disChecker}, + #{disTime}, + #{state}, + #{currentStationID}, + #{nGStationID}, + #{finishFlag}, + #{d9Remark}, + + + + + update T_SY_TraceState + + ProductID = #{productID}, + BeginTime = #{beginTime}, + EndTime = #{endTime}, + ShiftID = #{shiftID}, + GroupID = #{groupID}, + ShiftNo = #{shiftNo}, + SemiBarcode_A = #{semibarcodeA}, + SemiBarcode_B = #{semibarcodeB}, + SemiBarcode_C = #{semibarcodeC}, + ProductBarcode = #{productBarcode}, + SemiBarcode2 = #{semiBarcode2}, + shellbarcode = #{shellbarcode}, + NameplateInfo = #{nameplateInfo}, + MarkRecord = #{markRecord}, + Attr1 = #{attr1}, + Attr2 = #{attr2}, + ISDis = #{isDis}, + DisChecker = #{disChecker}, + DisTime = #{disTime}, + State = #{state}, + CurrentStationID = #{currentStationID}, + NGStationID = #{nGStationID}, + FinishFlag = #{finishFlag}, + D9Remark = #{d9Remark}, + + where Barcode = #{barcode} + + + + delete from T_SY_TraceState where Barcode = #{barcode} + + + + delete from T_SY_TraceState where Barcode in + + #{barcode} + + + +