From 55862e3fab6a2fd053f1d20167d2c784a73edbea Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Thu, 28 Jan 2021 16:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=8F=82=E6=95=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E6=88=96=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=89=98=E7=9B=98=E7=AE=A1=E7=90=86=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TRpWorktrayhistoryinfoController.java | 126 ++++++++++++ .../TRpWorktrayrealtimeinfoController.java | 184 ++++++++++++++++++ .../TSyStationparameternotesController.java | 45 ++++- .../nanjing/SubStation/SubStation.html | 2 +- .../nanjing/SubStation/editParam.html | 64 +++--- .../WorkTrayHistoryInfo.html | 122 ++++++++++++ .../nanjing/WorkTrayHistoryInfo/add.html | 51 +++++ .../nanjing/WorkTrayHistoryInfo/edit.html | 52 +++++ .../WorkTrayRealTimeInfo.html | 134 +++++++++++++ .../nanjing/WorkTrayRealTimeInfo/add.html | 34 ++++ .../nanjing/WorkTrayRealTimeInfo/edit.html | 92 +++++++++ .../domain/TRpWorktrayhistoryinfo.java | 81 ++++++++ .../domain/TRpWorktrayrealtimeinfo.java | 136 +++++++++++++ .../mapper/TRpWorktrayhistoryinfoMapper.java | 61 ++++++ .../mapper/TRpWorktrayrealtimeinfoMapper.java | 61 ++++++ .../TSyStationparameternotesMapper.java | 1 + .../ITRpWorktrayhistoryinfoService.java | 61 ++++++ .../ITRpWorktrayrealtimeinfoService.java | 61 ++++++ .../ITSyStationparameternotesService.java | 1 + .../TRpWorktrayhistoryinfoServiceImpl.java | 96 +++++++++ .../TRpWorktrayrealtimeinfoServiceImpl.java | 96 +++++++++ .../TSyStationparameternotesServiceImpl.java | 1 + .../nanjing/TRpWorktrayhistoryinfoMapper.xml | 75 +++++++ .../nanjing/TRpWorktrayrealtimeinfoMapper.xml | 88 +++++++++ .../TSyStationparameternotesMapper.xml | 5 +- 25 files changed, 1689 insertions(+), 41 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayrealtimeinfoController.java create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/WorkTrayHistoryInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/edit.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayhistoryinfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayhistoryinfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayhistoryinfoServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml 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 new file mode 100644 index 00000000..60dbb174 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayhistoryinfoController.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.TRpWorktrayhistoryinfo; +import com.ruoyi.nanjing.service.ITRpWorktrayhistoryinfoService; +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; + +/** + * 工位历史生产信息Controller + * + * @author limy + * @date 2021-01-28 + */ +@Controller +@RequestMapping("/nanjing/WorkTrayHistoryInfo") +public class TRpWorktrayhistoryinfoController extends BaseController +{ + private String prefix = "nanjing/WorkTrayHistoryInfo"; + + @Autowired + private ITRpWorktrayhistoryinfoService tRpWorktrayhistoryinfoService; + + @RequiresPermissions("nanjing:WorkTrayHistoryInfo:view") + @GetMapping() + public String WorkTrayHistoryInfo() + { + return prefix + "/WorkTrayHistoryInfo"; + } + + /** + * 查询工位历史生产信息列表 + */ + @RequiresPermissions("nanjing:WorkTrayHistoryInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) + { + startPage(); + List list = tRpWorktrayhistoryinfoService.selectTRpWorktrayhistoryinfoList(tRpWorktrayhistoryinfo); + return getDataTable(list); + } + + /** + * 导出工位历史生产信息列表 + */ + @RequiresPermissions("nanjing:WorkTrayHistoryInfo:export") + @Log(title = "工位历史生产信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) + { + List list = tRpWorktrayhistoryinfoService.selectTRpWorktrayhistoryinfoList(tRpWorktrayhistoryinfo); + 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/TRpWorktrayrealtimeinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayrealtimeinfoController.java new file mode 100644 index 00000000..2ba7c417 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TRpWorktrayrealtimeinfoController.java @@ -0,0 +1,184 @@ +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 org.apache.shiro.authz.annotation.RequiresPermissions; +import org.aspectj.weaver.loadtime.Aj; +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.TRpWorktrayrealtimeinfo; +import com.ruoyi.nanjing.service.ITRpWorktrayrealtimeinfoService; +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-28 + */ +@Controller +@RequestMapping("/nanjing/WorkTrayRealTimeInfo") +public class TRpWorktrayrealtimeinfoController extends BaseController +{ + private String prefix = "nanjing/WorkTrayRealTimeInfo"; + + @Autowired + private ITRpWorktrayrealtimeinfoService tRpWorktrayrealtimeinfoService; + + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:view") + @GetMapping() + public String WorkTrayRealTimeInfo() + { + return prefix + "/WorkTrayRealTimeInfo"; + } + + /** + * 查询托盘管理列表 + */ + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + startPage(); + List list = tRpWorktrayrealtimeinfoService.selectTRpWorktrayrealtimeinfoList(tRpWorktrayrealtimeinfo); + return getDataTable(list); + } + + /** + * 导出托盘管理列表 + */ + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:export") + @Log(title = "托盘管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + List list = tRpWorktrayrealtimeinfoService.selectTRpWorktrayrealtimeinfoList(tRpWorktrayrealtimeinfo); + ExcelUtil util = new ExcelUtil(TRpWorktrayrealtimeinfo.class); + return util.exportExcel(list, "WorkTrayRealTimeInfo"); + } + + /** + * 新增托盘管理 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存托盘管理 + */ + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:add") + @Log(title = "托盘管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + tRpWorktrayrealtimeinfo.setInsertTime(new Date()); + tRpWorktrayrealtimeinfo.setCurrentStation("0"); + tRpWorktrayrealtimeinfo.setState(0L); + tRpWorktrayrealtimeinfo.setUsedFlag(1L); + return toAjax(tRpWorktrayrealtimeinfoService.insertTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo)); + } + + /** + * 修改托盘管理 + */ + @GetMapping("/edit/{rfidNum}") + public String edit(@PathVariable("rfidNum") String rfidNum, ModelMap mmap) + { + TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo = tRpWorktrayrealtimeinfoService.selectTRpWorktrayrealtimeinfoById(rfidNum); + mmap.put("tRpWorktrayrealtimeinfo", tRpWorktrayrealtimeinfo); + return prefix + "/edit"; + } + + /** + * 修改保存托盘管理 + */ + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:edit") + @Log(title = "托盘管理", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + return toAjax(tRpWorktrayrealtimeinfoService.updateTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo)); + } + + /** + * 删除托盘管理 + */ + @RequiresPermissions("nanjing:WorkTrayRealTimeInfo:remove") + @Log(title = "托盘管理", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tRpWorktrayrealtimeinfoService.deleteTRpWorktrayrealtimeinfoByIds(ids)); + } + + /** + *启用托盘 + */ + @PostMapping("/start") + @ResponseBody + public AjaxResult startPallet(HttpServletRequest request){ + String rfidNum = request.getParameter("rfidNum"); + String msg = ""; + TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo = tRpWorktrayrealtimeinfoService.selectTRpWorktrayrealtimeinfoById(rfidNum); + if(tRpWorktrayrealtimeinfo.getUsedFlag()==0){ + tRpWorktrayrealtimeinfo.setUsedFlag(1L); + tRpWorktrayrealtimeinfo.setUpdateTime(new Date()); + int res = tRpWorktrayrealtimeinfoService.updateTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo); + if(res>0){ + msg = "已启用!"; + return AjaxResult.success(msg); + } + } + else + { + msg="已是启用状态！"; + } + return AjaxResult.error(msg); + } + @PostMapping("/end") + @ResponseBody + public AjaxResult endPallet(HttpServletRequest request){ + String rfidNum = request.getParameter("rfidNum"); + String msg = ""; + TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo = tRpWorktrayrealtimeinfoService.selectTRpWorktrayrealtimeinfoById(rfidNum); + if(tRpWorktrayrealtimeinfo.getUsedFlag()==1){ + tRpWorktrayrealtimeinfo.setUsedFlag(0L); + tRpWorktrayrealtimeinfo.setUpdateTime(new Date()); + tRpWorktrayrealtimeinfo.setDeleteTime(new Date()); + int res = tRpWorktrayrealtimeinfoService.updateTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo); + if(res>0){ + msg = "已停用!"; + return AjaxResult.success(msg); + } + } + else + { + msg="已是停用状态！"; + } + return AjaxResult.error(msg); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java index 9d351885..7866bb74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/TSyStationparameternotesController.java @@ -1,6 +1,11 @@ package com.ruoyi.web.controller.nanjing; +import java.util.ArrayList; import java.util.List; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -114,6 +119,42 @@ public class TSyStationparameternotesController extends BaseController return toAjax(tSyStationparameternotesService.updateTSyStationparameternotes(tSyStationparameternotes)); } + @RequiresPermissions("nanjing:SubStation:param") + @PostMapping("/editParmSave") + @ResponseBody + public AjaxResult editParmSave(HttpServletRequest request){ +// 查询实体 + int res = 0; +// 结果实体列表 + List ts = new ArrayList(); + String StationID = request.getParameter("stationID"); + String StationCode = request.getParameter("stationCode"); + String TableName = request.getParameter("tableName"); + String para = request.getParameter("paras"); + String[] paras = para.split(","); + for (int i=1;i<=paras.length;i++){ + TSyStationparameternotes tSyStationparameternotes = new TSyStationparameternotes(); + if(!(paras[i-1].equals(""))||paras[i-1]!=null){ //参数不为空时执行 + tSyStationparameternotes.setTabelName(TableName); + tSyStationparameternotes.setParaColumn("Para"+i); + ts = tSyStationparameternotesService.selectTSyStationparameternotesList(tSyStationparameternotes); + if(ts.size()==0){ //判断不存在此参数记录，则新增记录 + tSyStationparameternotes.setStationCode(StationCode); + tSyStationparameternotes.setStationID(StationID); + tSyStationparameternotes.setUsedFlag("1"); + tSyStationparameternotes.setParaMeaning(paras[i-1]); + res =tSyStationparameternotesService.insertTSyStationparameternotes(tSyStationparameternotes); + }else{ //判断存在此参数记录，则更新 + tSyStationparameternotes.setId(ts.get(0).getId()); + tSyStationparameternotes.setStationCode(StationCode); + tSyStationparameternotes.setStationID(StationID); + tSyStationparameternotes.setParaMeaning(paras[i-1]); + res=tSyStationparameternotesService.updateTSyStationparameternotes(tSyStationparameternotes); + } + } + } + return toAjax(res); + } /** * 删除工位参数定义 */ @@ -144,10 +185,6 @@ public class TSyStationparameternotesController extends BaseController paraMean=""; } } -// TSyStationparameternotes tSyStationparameternotes = tSyStationparameternotesService.getParaVal(stationID,para); -// if(tSyStationparameternotes.getParaMeaning().equals("")||tSyStationparameternotes.getParaMeaning()==null){ -// return AjaxResult.error(" "); -// } return AjaxResult.success(paraMean); } } diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html index 301925e4..03a2910c 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/SubStation.html @@ -106,7 +106,7 @@ function jmpParam(id) { var url = table.options.editParamUrl.replace("{id}", id); - console.log(url); + // console.log(url); $.modal.open("修改工位参数", url); } diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html index 634960a0..e6c7122f 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/SubStation/editParam.html @@ -22,7 +22,7 @@
- +
@@ -36,7 +36,7 @@
- +
@@ -45,30 +45,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - @@ -81,17 +57,37 @@ function submitHandler() { if ($.validate.form()) { var formData = new FormData(); - formData.append("StationID",$("StationID").val()); - formData.append("StationCode",$("StationCode").val()); - formData.append("TableName",$("TableName").val()); - for () - $.operate.save(prefix + "/editParmSave", formData ); //$('#form-SubStation-editParam').serialize() + var para = new Array(); + formData.append("stationID",$("#StationID").val()); + formData.append("stationCode",$("#StationCode").val()); + formData.append("tableName",$("#TableName").val()); + $("input[name='para']").each(function(){ + para.push($(this).val()); + }); + formData.append("paras",para); + $.ajax({ + type: "post", + url: prefix + "/editParmSave", + data: formData, + contentType: false, + processData: false, + dataType: "json", + success: function (result) { + // console.log(result.msg); + if (result.code == web_status.SUCCESS){ + alert(result.msg); + $.modal.close(); + }else{ + alert(result.msg); + } + } + }); } } $(function() { var paramCount = $('#paraCount').val(); - console.log(paramCount); + // console.log(paramCount); var i =0; while(i + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/add.html new file mode 100644 index 00000000..219a193f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/add.html @@ -0,0 +1,51 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/edit.html new file mode 100644 index 00000000..67199e86 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayHistoryInfo/edit.html @@ -0,0 +1,52 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ 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 new file mode 100644 index 00000000..ba33fc7f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/WorkTrayRealTimeInfo.html @@ -0,0 +1,134 @@ + + + + + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/add.html new file mode 100644 index 00000000..7afbc92f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/add.html @@ -0,0 +1,34 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/edit.html new file mode 100644 index 00000000..a62e0a2f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/WorkTrayRealTimeInfo/edit.html @@ -0,0 +1,92 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file 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 new file mode 100644 index 00000000..b352de8b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayhistoryinfo.java @@ -0,0 +1,81 @@ +package com.ruoyi.nanjing.domain; + +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; + +/** + * 工位历史生产信息对象 T_RP_WorkTrayHistoryInfo + * + * @author limy + * @date 2021-01-28 + */ +public class TRpWorktrayhistoryinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 当前工位 */ + @Excel(name = "当前工位") + private String currentStation; + + /** 系统条码 */ + @Excel(name = "系统条码") + private String barCode; + + /** RFID条码 */ + @Excel(name = "RFID条码") + private String rfidNum; + + /** 质量品级 */ + @Excel(name = "质量品级") + private String state; + + public void setCurrentStation(String currentStation) + { + this.currentStation = currentStation; + } + + public String getCurrentStation() + { + return currentStation; + } + public void setBarCode(String barCode) + { + this.barCode = barCode; + } + + public String getBarCode() + { + return barCode; + } + public void setRfidNum(String rfidNum) + { + this.rfidNum = rfidNum; + } + + public String getRfidNum() + { + return rfidNum; + } + public void setState(String state) + { + this.state = state; + } + + public String getState() + { + return state; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("currentStation", getCurrentStation()) + .append("barCode", getBarCode()) + .append("rfidNum", getRfidNum()) + .append("state", getState()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} 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 new file mode 100644 index 00000000..c6974572 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java @@ -0,0 +1,136 @@ +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; + +/** + * 托盘管理对象 T_RP_WorkTrayRealTimeInfo + * + * @author limy + * @date 2021-01-28 + */ +public class TRpWorktrayrealtimeinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 托盘条码 */ + @Excel(name = "托盘条码") + private String rfidNum; + + /** 系统条码 */ + @Excel(name = "系统条码") + private String barCode; + + /** 产线条码 */ + @Excel(name = "产线条码") + private String semiBarcode; + + /** 当前工位 */ + private String currentStation; + + /** 质量品级 */ + private Long state; + + /** 使用状态 */ + @Excel(name = "使用状态") + private Long usedFlag; + + /** 添加时间 */ + @Excel(name = "添加时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date insertTime; + + /** 停用时间 */ + @Excel(name = "停用时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date deleteTime; + + public void setRfidNum(String rfidNum) + { + this.rfidNum = rfidNum; + } + + public String getRfidNum() + { + return rfidNum; + } + 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 setCurrentStation(String currentStation) + { + this.currentStation = currentStation; + } + + public String getCurrentStation() + { + return currentStation; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setUsedFlag(Long usedFlag) + { + this.usedFlag = usedFlag; + } + + public Long getUsedFlag() + { + return usedFlag; + } + public void setInsertTime(Date insertTime) + { + this.insertTime = insertTime; + } + + public Date getInsertTime() + { + return insertTime; + } + public void setDeleteTime(Date deleteTime) + { + this.deleteTime = deleteTime; + } + + public Date getDeleteTime() + { + return deleteTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("rfidNum", getRfidNum()) + .append("barCode", getBarCode()) + .append("semiBarcode", getSemiBarcode()) + .append("currentStation", getCurrentStation()) + .append("state", getState()) + .append("updateTime", getUpdateTime()) + .append("usedFlag", getUsedFlag()) + .append("insertTime", getInsertTime()) + .append("deleteTime", getDeleteTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayhistoryinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayhistoryinfoMapper.java new file mode 100644 index 00000000..f80b0bab --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayhistoryinfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpWorktrayhistoryinfo; + +/** + * 工位历史生产信息Mapper接口 + * + * @author limy + * @date 2021-01-28 + */ +public interface TRpWorktrayhistoryinfoMapper +{ + /** + * 查询工位历史生产信息 + * + * @param currentStation 工位历史生产信息ID + * @return 工位历史生产信息 + */ + public TRpWorktrayhistoryinfo selectTRpWorktrayhistoryinfoById(String currentStation); + + /** + * 查询工位历史生产信息列表 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 工位历史生产信息集合 + */ + public List selectTRpWorktrayhistoryinfoList(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 新增工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + public int insertTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 修改工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + public int updateTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 删除工位历史生产信息 + * + * @param currentStation 工位历史生产信息ID + * @return 结果 + */ + public int deleteTRpWorktrayhistoryinfoById(String currentStation); + + /** + * 批量删除工位历史生产信息 + * + * @param currentStations 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpWorktrayhistoryinfoByIds(String[] currentStations); +} 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 new file mode 100644 index 00000000..c5e73c98 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TRpWorktrayrealtimeinfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpWorktrayrealtimeinfo; + +/** + * 托盘管理Mapper接口 + * + * @author limy + * @date 2021-01-28 + */ +public interface TRpWorktrayrealtimeinfoMapper +{ + /** + * 查询托盘管理 + * + * @param rfidNum 托盘管理ID + * @return 托盘管理 + */ + public TRpWorktrayrealtimeinfo selectTRpWorktrayrealtimeinfoById(String rfidNum); + + /** + * 查询托盘管理列表 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 托盘管理集合 + */ + public List selectTRpWorktrayrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 新增托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + public int insertTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 修改托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + public int updateTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 删除托盘管理 + * + * @param rfidNum 托盘管理ID + * @return 结果 + */ + public int deleteTRpWorktrayrealtimeinfoById(String rfidNum); + + /** + * 批量删除托盘管理 + * + * @param rfidNums 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpWorktrayrealtimeinfoByIds(String[] rfidNums); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java index 3a53bec2..444bfb78 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyStationparameternotesMapper.java @@ -62,4 +62,5 @@ public interface TSyStationparameternotesMapper TSyStationparameternotes getParaVal(String stationID, String para); List selectByStationID(String stationID); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayhistoryinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayhistoryinfoService.java new file mode 100644 index 00000000..bf520ef7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayhistoryinfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpWorktrayhistoryinfo; + +/** + * 工位历史生产信息Service接口 + * + * @author limy + * @date 2021-01-28 + */ +public interface ITRpWorktrayhistoryinfoService +{ + /** + * 查询工位历史生产信息 + * + * @param currentStation 工位历史生产信息ID + * @return 工位历史生产信息 + */ + public TRpWorktrayhistoryinfo selectTRpWorktrayhistoryinfoById(String currentStation); + + /** + * 查询工位历史生产信息列表 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 工位历史生产信息集合 + */ + public List selectTRpWorktrayhistoryinfoList(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 新增工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + public int insertTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 修改工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + public int updateTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo); + + /** + * 批量删除工位历史生产信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpWorktrayhistoryinfoByIds(String ids); + + /** + * 删除工位历史生产信息信息 + * + * @param currentStation 工位历史生产信息ID + * @return 结果 + */ + public int deleteTRpWorktrayhistoryinfoById(String currentStation); +} 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 new file mode 100644 index 00000000..78d1a882 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITRpWorktrayrealtimeinfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.TRpWorktrayrealtimeinfo; + +/** + * 托盘管理Service接口 + * + * @author limy + * @date 2021-01-28 + */ +public interface ITRpWorktrayrealtimeinfoService +{ + /** + * 查询托盘管理 + * + * @param rfidNum 托盘管理ID + * @return 托盘管理 + */ + public TRpWorktrayrealtimeinfo selectTRpWorktrayrealtimeinfoById(String rfidNum); + + /** + * 查询托盘管理列表 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 托盘管理集合 + */ + public List selectTRpWorktrayrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 新增托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + public int insertTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 修改托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + public int updateTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo); + + /** + * 批量删除托盘管理 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTRpWorktrayrealtimeinfoByIds(String ids); + + /** + * 删除托盘管理信息 + * + * @param rfidNum 托盘管理ID + * @return 结果 + */ + public int deleteTRpWorktrayrealtimeinfoById(String rfidNum); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java index a7152492..41198d73 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITSyStationparameternotesService.java @@ -62,4 +62,5 @@ public interface ITSyStationparameternotesService TSyStationparameternotes getParaVal(String stationID, String para); List selectByStationID(String stationID); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayhistoryinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayhistoryinfoServiceImpl.java new file mode 100644 index 00000000..cce5d61c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayhistoryinfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.TRpWorktrayhistoryinfoMapper; +import com.ruoyi.nanjing.domain.TRpWorktrayhistoryinfo; +import com.ruoyi.nanjing.service.ITRpWorktrayhistoryinfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 工位历史生产信息Service业务层处理 + * + * @author limy + * @date 2021-01-28 + */ +@Service +public class TRpWorktrayhistoryinfoServiceImpl implements ITRpWorktrayhistoryinfoService +{ + @Autowired + private TRpWorktrayhistoryinfoMapper tRpWorktrayhistoryinfoMapper; + + /** + * 查询工位历史生产信息 + * + * @param currentStation 工位历史生产信息ID + * @return 工位历史生产信息 + */ + @Override + public TRpWorktrayhistoryinfo selectTRpWorktrayhistoryinfoById(String currentStation) + { + return tRpWorktrayhistoryinfoMapper.selectTRpWorktrayhistoryinfoById(currentStation); + } + + /** + * 查询工位历史生产信息列表 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 工位历史生产信息 + */ + @Override + public List selectTRpWorktrayhistoryinfoList(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) + { + return tRpWorktrayhistoryinfoMapper.selectTRpWorktrayhistoryinfoList(tRpWorktrayhistoryinfo); + } + + /** + * 新增工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + @Override + public int insertTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) + { + return tRpWorktrayhistoryinfoMapper.insertTRpWorktrayhistoryinfo(tRpWorktrayhistoryinfo); + } + + /** + * 修改工位历史生产信息 + * + * @param tRpWorktrayhistoryinfo 工位历史生产信息 + * @return 结果 + */ + @Override + public int updateTRpWorktrayhistoryinfo(TRpWorktrayhistoryinfo tRpWorktrayhistoryinfo) + { + tRpWorktrayhistoryinfo.setUpdateTime(DateUtils.getNowDate()); + return tRpWorktrayhistoryinfoMapper.updateTRpWorktrayhistoryinfo(tRpWorktrayhistoryinfo); + } + + /** + * 删除工位历史生产信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTRpWorktrayhistoryinfoByIds(String ids) + { + return tRpWorktrayhistoryinfoMapper.deleteTRpWorktrayhistoryinfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除工位历史生产信息信息 + * + * @param currentStation 工位历史生产信息ID + * @return 结果 + */ + @Override + public int deleteTRpWorktrayhistoryinfoById(String currentStation) + { + return tRpWorktrayhistoryinfoMapper.deleteTRpWorktrayhistoryinfoById(currentStation); + } +} 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 new file mode 100644 index 00000000..57ee116d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TRpWorktrayrealtimeinfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.TRpWorktrayrealtimeinfoMapper; +import com.ruoyi.nanjing.domain.TRpWorktrayrealtimeinfo; +import com.ruoyi.nanjing.service.ITRpWorktrayrealtimeinfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 托盘管理Service业务层处理 + * + * @author limy + * @date 2021-01-28 + */ +@Service +public class TRpWorktrayrealtimeinfoServiceImpl implements ITRpWorktrayrealtimeinfoService +{ + @Autowired + private TRpWorktrayrealtimeinfoMapper tRpWorktrayrealtimeinfoMapper; + + /** + * 查询托盘管理 + * + * @param rfidNum 托盘管理ID + * @return 托盘管理 + */ + @Override + public TRpWorktrayrealtimeinfo selectTRpWorktrayrealtimeinfoById(String rfidNum) + { + return tRpWorktrayrealtimeinfoMapper.selectTRpWorktrayrealtimeinfoById(rfidNum); + } + + /** + * 查询托盘管理列表 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 托盘管理 + */ + @Override + public List selectTRpWorktrayrealtimeinfoList(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + return tRpWorktrayrealtimeinfoMapper.selectTRpWorktrayrealtimeinfoList(tRpWorktrayrealtimeinfo); + } + + /** + * 新增托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + @Override + public int insertTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + return tRpWorktrayrealtimeinfoMapper.insertTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo); + } + + /** + * 修改托盘管理 + * + * @param tRpWorktrayrealtimeinfo 托盘管理 + * @return 结果 + */ + @Override + public int updateTRpWorktrayrealtimeinfo(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) + { + tRpWorktrayrealtimeinfo.setUpdateTime(DateUtils.getNowDate()); + return tRpWorktrayrealtimeinfoMapper.updateTRpWorktrayrealtimeinfo(tRpWorktrayrealtimeinfo); + } + + /** + * 删除托盘管理对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteTRpWorktrayrealtimeinfoByIds(String ids) + { + return tRpWorktrayrealtimeinfoMapper.deleteTRpWorktrayrealtimeinfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除托盘管理信息 + * + * @param rfidNum 托盘管理ID + * @return 结果 + */ + @Override + public int deleteTRpWorktrayrealtimeinfoById(String rfidNum) + { + return tRpWorktrayrealtimeinfoMapper.deleteTRpWorktrayrealtimeinfoById(rfidNum); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java index 71ac30fc..b167b2cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TSyStationparameternotesServiceImpl.java @@ -101,4 +101,5 @@ public class TSyStationparameternotesServiceImpl implements ITSyStationparameter public List selectByStationID(String stationID) { return tSyStationparameternotesMapper.selectByStationID(stationID); } + } diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml new file mode 100644 index 00000000..4bc6f228 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayhistoryinfoMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + select CurrentStation, barCode, RFIDNum, State, updateTime from T_RP_WorkTrayHistoryInfo + + + + + + + + insert into T_RP_WorkTrayHistoryInfo + + CurrentStation, + barCode, + RFIDNum, + State, + updateTime, + + + #{currentStation}, + #{barCode}, + #{rfidNum}, + #{state}, + #{updateTime}, + + + + + update T_RP_WorkTrayHistoryInfo + + barCode = #{barCode}, + RFIDNum = #{rfidNum}, + State = #{state}, + updateTime = #{updateTime}, + + where CurrentStation = #{currentStation} + + + + delete from T_RP_WorkTrayHistoryInfo where CurrentStation = #{currentStation} + + + + delete from T_RP_WorkTrayHistoryInfo where CurrentStation in + + #{currentStation} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml new file mode 100644 index 00000000..a1fa4c19 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TRpWorktrayrealtimeinfoMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + select RFIDNum, barCode, SemiBarcode, CurrentStation, State, updateTime, UsedFlag, InsertTime, DeleteTime from T_RP_WorkTrayRealTimeInfo + + + + + + + + insert into T_RP_WorkTrayRealTimeInfo + + RFIDNum, + barCode, + SemiBarcode, + CurrentStation, + State, + updateTime, + UsedFlag, + InsertTime, + DeleteTime, + + + #{rfidNum}, + #{barCode}, + #{semiBarcode}, + #{currentStation}, + #{state}, + #{updateTime}, + #{usedFlag}, + #{insertTime}, + #{deleteTime}, + + + + + update T_RP_WorkTrayRealTimeInfo + + barCode = #{barCode}, + SemiBarcode = #{semiBarcode}, + CurrentStation = #{currentStation}, + State = #{state}, + updateTime = #{updateTime}, + UsedFlag = #{usedFlag}, + InsertTime = #{insertTime}, + DeleteTime = #{deleteTime}, + + where RFIDNum = #{rfidNum} + + + + delete from T_RP_WorkTrayRealTimeInfo where RFIDNum = #{rfidNum} + + + + delete from T_RP_WorkTrayRealTimeInfo where RFIDNum in + + #{rfidNum} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TSyStationparameternotesMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TSyStationparameternotesMapper.xml index 64fb47b8..1123ea47 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TSyStationparameternotesMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TSyStationparameternotesMapper.xml @@ -50,10 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where StationID = #{stationID} + insert into T_SY_StationParameterNotes - ID, + TabelName, ParaColumn, ParaMeaning, @@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UsedFlag, - #{id}, + #{tabelName}, #{paraColumn}, #{paraMeaning},