From 1e5ddca777ae0a1a389e835dfe0c5a8a973eea7f Mon Sep 17 00:00:00 2001 From: CaesarBao Date: Tue, 16 Sep 2025 09:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseBarcodePrintinfoController.java | 128 ++++++++++++++++ .../ruoyi/web/controller/nanjing/Rework.java | 14 +- .../nanjing/SelectProRpListController.java | 2 +- .../nanjing/StationParaInfoController.java | 17 +-- .../TRpBarcoderelationshipController.java | 10 +- .../src/main/resources/application.yml | 2 +- .../BarcodeRelationShip.html | 48 +++--- .../nanjing/PrintInfo/PrintInfo.html | 144 ++++++++++++++++++ .../templates/nanjing/PrintInfo/add.html | 78 ++++++++++ .../templates/nanjing/PrintInfo/edit.html | 79 ++++++++++ .../nanjing/ProRpList/SelectProRpList.html | 8 +- .../templates/nanjing/Rework/Rework.html | 85 ++++++++++- .../nanjing/domain/BaseBarcodePrintinfo.java | 131 ++++++++++++++++ .../nanjing/domain/BaseRepairinfoRecord.java | 10 ++ .../domain/TRpBarcoderelationship.java | 29 ++-- .../mapper/BaseBarcodePrintinfoMapper.java | 62 ++++++++ .../service/IBaseBarcodePrintinfoService.java | 62 ++++++++ .../impl/BaseBarcodePrintinfoServiceImpl.java | 95 ++++++++++++ .../nanjing/BaseBarcodePrintinfoMapper.xml | 95 ++++++++++++ .../mapper/nanjing/TBdProducttypeMapper.xml | 2 +- .../nanjing/TRpBarcoderelationshipMapper.xml | 8 +- 21 files changed, 1045 insertions(+), 64 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BaseBarcodePrintinfoController.java create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/PrintInfo.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/edit.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseBarcodePrintinfo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BaseBarcodePrintinfoMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBaseBarcodePrintinfoService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BaseBarcodePrintinfoServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/BaseBarcodePrintinfoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BaseBarcodePrintinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BaseBarcodePrintinfoController.java new file mode 100644 index 00000000..6432e39f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BaseBarcodePrintinfoController.java @@ -0,0 +1,128 @@ +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.BaseBarcodePrintinfo; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import com.ruoyi.nanjing.service.IBaseBarcodePrintinfoService; +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.*; + +import java.util.List; + +/** + * 条码打印记录Controller + * + * @author ruoyi + * @date 2024-05-24 + */ +@Controller +@RequestMapping("/nanjing/PrintInfo") +public class BaseBarcodePrintinfoController extends BaseController +{ + private String prefix = "nanjing/PrintInfo"; + @Autowired + private ITBdProductinfoService tBdProductinfoService; + @Autowired + private IBaseBarcodePrintinfoService baseBarcodePrintinfoService; + + @RequiresPermissions("nanjing:PrintInfo:view") + @GetMapping() + public String PrintInfo(ModelMap map) + { + List tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo()); + map.addAttribute("list",tBdProductinfoList); + return prefix + "/PrintInfo"; + } + + /** + * 查询条码打印记录列表 + */ + @RequiresPermissions("nanjing:PrintInfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + startPage(); + List list = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo); + return getDataTable(list); + } + + /** + * 导出条码打印记录列表 + */ + @RequiresPermissions("nanjing:PrintInfo:export") + @Log(title = "条码打印记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + List list = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo); + ExcelUtil util = new ExcelUtil(BaseBarcodePrintinfo.class); + return util.exportExcel(list, "PrintInfo"); + } + + /** + * 新增条码打印记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存条码打印记录 + */ + @RequiresPermissions("nanjing:PrintInfo:add") + @Log(title = "条码打印记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + return toAjax(baseBarcodePrintinfoService.insertBaseBarcodePrintinfo(baseBarcodePrintinfo)); + } + + /** + * 修改条码打印记录 + */ + @GetMapping("/edit/{ID}") + public String edit(@PathVariable("ID") String ID, ModelMap mmap) + { + BaseBarcodePrintinfo baseBarcodePrintinfo = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoById(ID); + mmap.put("baseBarcodePrintinfo", baseBarcodePrintinfo); + return prefix + "/edit"; + } + + /** + * 修改保存条码打印记录 + */ + @RequiresPermissions("nanjing:PrintInfo:edit") + @Log(title = "条码打印记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + return toAjax(baseBarcodePrintinfoService.updateBaseBarcodePrintinfo(baseBarcodePrintinfo)); + } + + /** + * 删除条码打印记录 + */ + @RequiresPermissions("nanjing:PrintInfo:remove") + @Log(title = "条码打印记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseBarcodePrintinfoService.deleteBaseBarcodePrintinfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/Rework.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/Rework.java index 642ab887..ac736f25 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/Rework.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/Rework.java @@ -5,6 +5,7 @@ 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.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.nanjing.domain.BaseRepairinfoRecord; import com.ruoyi.nanjing.domain.ProRpList; @@ -21,10 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 时段统计 @@ -47,8 +45,10 @@ public class Rework extends BaseController @RequiresPermissions("nanjing:ProRpList:view") @GetMapping() - public String ProRpList(ModelMap map) + public String ProRpList(ModelMap map, Locale locale) { + map.put("beginTime", DateUtils.getDate()); + map.put("endTime",DateUtils.getDate()); List tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo()); map.addAttribute("list",tBdProductinfoList); return prefix + "/Rework"; @@ -165,6 +165,10 @@ public class Rework extends BaseController @PostMapping("/selectRework") @ResponseBody public TableDataInfo selectRework(ProRpList proRpList){ + if(proRpList.getBeginTime()==null || proRpList.getEndTime()==null){ + proRpList.setBeginTime(DateUtils.getNowDate()); + proRpList.setEndTime(DateUtils.addDays(proRpList.getBeginTime(),1)); + } startPage(); List list = new ArrayList<>(); list = reworkService.selectRework(proRpList.getBeginTime(),proRpList.getEndTime()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java index cd0be778..b596897b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectProRpListController.java @@ -79,7 +79,7 @@ public class SelectProRpListController extends BaseController @ResponseBody public TableDataInfo getData(ProRpList proRpList) { -// startPage(); + startPage(); List list = new ArrayList(); if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java index ed49898c..7a82f433 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StationParaInfoController.java @@ -79,7 +79,7 @@ public class StationParaInfoController extends BaseController { // s200 210 230 240直接查产品码 5 6 8 9 11 12 // s300 320 if (stationCode.equals("5")||stationCode.equals("6")||stationCode.equals("8") - ||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12") + ||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12")||stationCode.equals("13")||stationCode.equals("14")||stationCode.equals("15")||stationCode.equals("16")||stationCode.equals("17")||stationCode.equals("18")||stationCode.equals("19")||stationCode.equals("20") ){ map.put("ScanBarcode",productBarcode); @@ -88,15 +88,14 @@ public class StationParaInfoController extends BaseController { return getDataTable(list); } else{ - List> list = tracestateService.selectStationPara(map); - for (int i = 0; i < list.size(); i++) { - if (list.get(i).containsKey("系统主条码")) { - continue; - } else { - list.get(i).put("系统主条码", "-"); - } - } +// for (int i = 0; i < list.size(); i++) { +// if (list.get(i).containsKey("系统主条码")) { +// continue; +// } else { +// list.get(i).put("系统主条码", "-"); +// } +// } return getDataTable(list); } } 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 index 206ca80f..c86712f9 100644 --- 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 @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.nanjing; +import java.util.ArrayList; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +51,14 @@ public class TRpBarcoderelationshipController extends BaseController public TableDataInfo list(TRpBarcoderelationship tRpBarcoderelationship) { startPage(); - List list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); + if (tRpBarcoderelationship.getProductBarcode() == "") + return getDataTable(new ArrayList()); + List list1 = this.tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); + if (list1.stream().count() > 0L) { + tRpBarcoderelationship.setSemiBarcode(((TRpBarcoderelationship)list1.get(0)).getSemiBarcode()); + tRpBarcoderelationship.setProductBarcode(null); + } + List list = this.tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 66d96668..9290a052 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -17,7 +17,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 9080 + port: 9099 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html index 12e48da7..16c2f8c4 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationShip/BarcodeRelationShip.html @@ -10,26 +10,26 @@
    -
  • - - -
    • + + + +
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • + + + + + + + + + + + +
  • @@ -88,24 +88,24 @@ }, { field: 'semiBarcode', - title: 'Semi' + title: '序列号' }, { field: 'productBarcode', title: '产品条码' }, { - field: 'semibarcodeLine', - title: '支线条码' + field: 'matirialBarcode', + title: '定转子条码' }, { field: 'lineID', - title: '所属支线ID' - }, - { - field: 'stateFlag', - title: '是否生效' + title: '组件类别' }, + // { + // field: 'stateFlag', + // title: '是否生效' + // }, { field: 'insertTime', title: '记录时间' diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/PrintInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/PrintInfo.html new file mode 100644 index 00000000..ddf4df70 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/PrintInfo.html @@ -0,0 +1,144 @@ + + + + + + +
    +
    +
    + +
    +
      + + + + +
    • + + +
      • +
    • + + +
      • + + + + +
    • + + + +
      • +
    • + + +
      • +
    • + + + - + + + + + + + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    + +
    + +
    + + + + + + + + + + + 导出 + +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/add.html new file mode 100644 index 00000000..1aee3dd7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/add.html @@ -0,0 +1,78 @@ + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/edit.html new file mode 100644 index 00000000..d7ed95f5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/PrintInfo/edit.html @@ -0,0 +1,79 @@ + + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html index 3eba9555..08b143a1 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/ProRpList/SelectProRpList.html @@ -79,10 +79,10 @@ field: 'productName', title: '机种名称' }, - // { - // field: 'semiBarcode', - // title: '产品条码' - // }, + { + field: 'semiBarcode', + title: '组件条码' + }, { field: 'state', title: '状态' diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/Rework/Rework.html b/ruoyi-admin/src/main/resources/templates/nanjing/Rework/Rework.html index d47ac56b..7b7efe58 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/Rework/Rework.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/Rework/Rework.html @@ -52,7 +52,7 @@ }, { field:'id', - title:'id' + title:'编号' }, // { // field: 'barcode', @@ -62,10 +62,85 @@ field: 'productBarcode', title: '机种码' }, - // { - // field: 'semiBarcode', - // title: '产品条码' - // }, + { + field: 'ngStation', + title: 'NG工位', + formatter:function (value, row, index) { + if (value == 1) { + return "S100电机壳压销"; + } else if (value == 2) { + return "S110电机壳压销2"; + } else if (value == 3) { + return "S110定子放入电机机壳后上线"; + } else if (value == 4) { + return "10轴承压入电机壳底部"; + } else if (value == 5) { + return "S200前盖轴承轴封挡圈压入"; + } else if (value == 6) { + return "S210前盖压销"; + } else if (value == 7) { + return "S220曲轴压入转子"; + } else if (value == 8) { + return "S230曲轴组件和前盖轴承装配"; + } else if (value == 9) { + return "S240转子充磁"; + } else if (value == 10) { + return "20前盖组件放入电池壳"; + } else if (value == 11) { + return "S300静盘正反面压销"; + } else if (value == 12) { + return "S320动静盘组件高度测量"; + } else if (value == 13) { + return "30动静盘组件安装"; + } else if (value == 14) { + return "40机盘背面和机壳端面高度测量"; + } else if (value == 15) { + return "50后盖安装和螺栓预拧"; + } else if (value == 16) { + return "60后盖螺栓紧固"; + } else if (value == 17) { + return "70后盖螺栓测量"; + } else if (value == 18) { + return "100玻璃接线柱高度测量"; + } else if (value == 19) { + return "110玻璃接线柱螺栓紧固"; + } else if (value == 20) { + return "120裸机绝缘耐压检测"; + } else if (value == 21) { + return "130法兰安装、抽真空、充氦气"; + } else if (value == 22) { + return "140氦气检漏"; + } else if (value == 23) { + return "150氦气回收"; + } else if (value == 24) { + return "160导热硅脂喷涂"; + } else if (value == 25) { + return "180控制器螺栓紧固"; + } else if (value == 26) { + return "190控制器检漏"; + } else if (value == 27) { + return "200整机翻转"; + } else if (value == 28) { + return "210整机称重、注油"; + } else if (value == 29) { + return "220整机绝缘测试和法兰安装"; + } else if (value == 30) { + return "230_1性能测试（高速）"; + } else if (value == 31) { + return "230_2性能测试（低速）"; + } else if (value == 32) { + return "250整机补油"; + } else if (value == 33) { + return "260密封塞安装、抽真空充氦气"; + } else if (value == 34) { + return "270铭牌打印"; + } else if (value == 35) { + return "S300静盘正反面压销-2"; + } else if (value == 36) { + return "S110定子放入电机壳加热"; + } + } + }, { field: 'reStartStation', title: '重启工位', diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseBarcodePrintinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseBarcodePrintinfo.java new file mode 100644 index 00000000..79f835a8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseBarcodePrintinfo.java @@ -0,0 +1,131 @@ +package com.ruoyi.nanjing.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 条码打印记录对象 base_Barcode_PrintInfo + * + * @author ruoyi + * @date 2024-05-24 + */ +public class BaseBarcodePrintinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "编号") + private String ID; + + /** $column.columnComment */ + @Excel(name = "产品条码") + private String ProductBarcode; + + /** $column.columnComment */ + @Excel(name = "序列号") + private String SerialNo; + + /** $column.columnComment */ + @Excel(name = "是否补码") + private Long IsRestart; + + /** $column.columnComment */ + @Excel(name = "产品型号") + private Long ProductID; + + /** $column.columnComment */ + @Excel(name = "班次") + private String ShiftID; + + /** $column.columnComment */ + @Excel(name = "记录时间") + private Date InsertTime; + public TBdProductinfo gettBdProductinfo() { + return tBdProductinfo; + } + + public void settBdProductinfo(TBdProductinfo tBdProductinfo) { + this.tBdProductinfo = tBdProductinfo; + } + private TBdProductinfo tBdProductinfo; + public void setID(String ID) + { + this.ID = ID; + } + + public String getID() + { + return ID; + } + public void setProductBarcode(String ProductBarcode) + { + this.ProductBarcode = ProductBarcode; + } + + public String getProductBarcode() + { + return ProductBarcode; + } + public void setSerialNo(String SerialNo) + { + this.SerialNo = SerialNo; + } + + public String getSerialNo() + { + return SerialNo; + } + public void setIsRestart(Long IsRestart) + { + this.IsRestart = IsRestart; + } + + public Long getIsRestart() + { + return IsRestart; + } + public void setProductID(Long ProductID) + { + this.ProductID = ProductID; + } + + public Long getProductID() + { + return ProductID; + } + public void setShiftID(String ShiftID) + { + this.ShiftID = ShiftID; + } + + public String getShiftID() + { + return ShiftID; + } + 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("ProductBarcode", getProductBarcode()) + .append("SerialNo", getSerialNo()) + .append("IsRestart", getIsRestart()) + .append("ProductID", getProductID()) + .append("ShiftID", getShiftID()) + .append("InsertTime", getInsertTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseRepairinfoRecord.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseRepairinfoRecord.java index 13c0d8c2..6e068dc9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseRepairinfoRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BaseRepairinfoRecord.java @@ -7,6 +7,8 @@ public class BaseRepairinfoRecord { private static final long serialVersionUID = 1L; + private String ngStation; + private Integer id; private String barcode; @@ -67,4 +69,12 @@ public class BaseRepairinfoRecord { ", recordTime=" + recordTime + '}'; } + + public String getNgStation() { + return ngStation; + } + + public void setNgStation(String ngStation) { + this.ngStation = ngStation; + } } 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 index 085c2887..c0776f2d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpBarcoderelationship.java @@ -26,14 +26,15 @@ public class TRpBarcoderelationship extends BaseEntity /** 产品条码 */ @Excel(name = "产品条码") private String productBarcode; - + @Excel(name = "组件条码") + private String matirialBarcode; /** 支线条码 */ @Excel(name = "支线条码") private String semibarcodeLine; /** 所属支线ID */ @Excel(name = "所属支线ID") - private Long lineID; + private String lineID; /** 是否生效 */ @Excel(name = "是否生效") @@ -79,15 +80,7 @@ public class TRpBarcoderelationship extends BaseEntity { return semibarcodeLine; } - public void setLineID(Long lineID) - { - this.lineID = lineID; - } - public Long getLineID() - { - return lineID; - } public void setStateFlag(String stateFlag) { this.stateFlag = stateFlag; @@ -119,4 +112,20 @@ public class TRpBarcoderelationship extends BaseEntity .append("insertTime", getInsertTime()) .toString(); } + + public String getLineID() { + return lineID; + } + + public void setLineID(String lineID) { + this.lineID = lineID; + } + + public String getMatirialBarcode() { + return matirialBarcode; + } + + public void setMatirialBarcode(String matirialBarcode) { + this.matirialBarcode = matirialBarcode; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BaseBarcodePrintinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BaseBarcodePrintinfoMapper.java new file mode 100644 index 00000000..ed7b5bd1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BaseBarcodePrintinfoMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.nanjing.mapper; + +import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo; + +import java.util.List; + +/** + * 条码打印记录Mapper接口 + * + * @author ruoyi + * @date 2024-05-24 + */ +public interface BaseBarcodePrintinfoMapper +{ + /** + * 查询条码打印记录 + * + * @param ID 条码打印记录ID + * @return 条码打印记录 + */ + public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID); + + /** + * 查询条码打印记录列表 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 条码打印记录集合 + */ + public List selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 新增条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 修改条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 删除条码打印记录 + * + * @param ID 条码打印记录ID + * @return 结果 + */ + public int deleteBaseBarcodePrintinfoById(String ID); + + /** + * 批量删除条码打印记录 + * + * @param IDs 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseBarcodePrintinfoByIds(String[] IDs); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBaseBarcodePrintinfoService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBaseBarcodePrintinfoService.java new file mode 100644 index 00000000..6900a3a3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBaseBarcodePrintinfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.nanjing.service; + +import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo; + +import java.util.List; + +/** + * 条码打印记录Service接口 + * + * @author ruoyi + * @date 2024-05-24 + */ +public interface IBaseBarcodePrintinfoService +{ + /** + * 查询条码打印记录 + * + * @param ID 条码打印记录ID + * @return 条码打印记录 + */ + public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID); + + /** + * 查询条码打印记录列表 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 条码打印记录集合 + */ + public List selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 新增条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 修改条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo); + + /** + * 批量删除条码打印记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseBarcodePrintinfoByIds(String ids); + + /** + * 删除条码打印记录信息 + * + * @param ID 条码打印记录ID + * @return 结果 + */ + public int deleteBaseBarcodePrintinfoById(String ID); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BaseBarcodePrintinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BaseBarcodePrintinfoServiceImpl.java new file mode 100644 index 00000000..72be4dd2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BaseBarcodePrintinfoServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.nanjing.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo; +import com.ruoyi.nanjing.mapper.BaseBarcodePrintinfoMapper; +import com.ruoyi.nanjing.service.IBaseBarcodePrintinfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 条码打印记录Service业务层处理 + * + * @author ruoyi + * @date 2024-05-24 + */ +@Service +public class BaseBarcodePrintinfoServiceImpl implements IBaseBarcodePrintinfoService +{ + @Autowired + private BaseBarcodePrintinfoMapper baseBarcodePrintinfoMapper; + + /** + * 查询条码打印记录 + * + * @param ID 条码打印记录ID + * @return 条码打印记录 + */ + @Override + public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID) + { + return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoById(ID); + } + + /** + * 查询条码打印记录列表 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 条码打印记录 + */ + @Override + public List selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo); + } + + /** + * 新增条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + @Override + public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + return baseBarcodePrintinfoMapper.insertBaseBarcodePrintinfo(baseBarcodePrintinfo); + } + + /** + * 修改条码打印记录 + * + * @param baseBarcodePrintinfo 条码打印记录 + * @return 结果 + */ + @Override + public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo) + { + return baseBarcodePrintinfoMapper.updateBaseBarcodePrintinfo(baseBarcodePrintinfo); + } + + /** + * 删除条码打印记录对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBaseBarcodePrintinfoByIds(String ids) + { + return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除条码打印记录信息 + * + * @param ID 条码打印记录ID + * @return 结果 + */ + @Override + public int deleteBaseBarcodePrintinfoById(String ID) + { + return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoById(ID); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/BaseBarcodePrintinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/BaseBarcodePrintinfoMapper.xml new file mode 100644 index 00000000..dec69582 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/BaseBarcodePrintinfoMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + select t1.ID, t1.ProductBarcode, t1.SerialNo, t1.IsRestart, t1.ProductID, t2.ProductName,t1.ShiftID, t1.InsertTime from base_Barcode_PrintInfo t1 + left join T_BD_ProductInfo t2 on t1.ProductId = t2.ProductID + + + + + + + + insert into base_Barcode_PrintInfo + + ID, + ProductBarcode, + SerialNo, + IsRestart, + ProductID, + ShiftID, + InsertTime, + + + #{ID}, + #{ProductBarcode}, + #{SerialNo}, + #{IsRestart}, + #{ProductID}, + #{ShiftID}, + #{InsertTime}, + + + + + update base_Barcode_PrintInfo + + ProductBarcode = #{ProductBarcode}, + SerialNo = #{SerialNo}, + IsRestart = #{IsRestart}, + ProductID = #{ProductID}, + ShiftID = #{ShiftID}, + InsertTime = #{InsertTime}, + + where ID = #{ID} + + + + delete from base_Barcode_PrintInfo where ID = #{ID} + + + + delete from base_Barcode_PrintInfo where ID in + + #{ID} + + + + diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml index ec49515a..5420f001 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select ID, SemiBarcode, t1.ProductBarcode, SemiBarcode_Line, CASE WHEN LineID=1 THEN '壳体码'when LineID = 2 then '前盖码'when LineID = 3 then '动盘码'when LineID =4 then '静盘码' WHEN LineID = 5 then '后盖码' WHEN LineID = 0 then '控制器码' end as lineID,t2.MatirialBarcode, StateFlag, t1.InsertTime from T_RP_BarcodeRelationShip + t1 + left join dbo.T_RP_MatirialBarcodeRelationShip t2 on t1.ProductBarcode = t2.ProductBarcode and SemiBarcode = #{semiBarcode} - and ProductBarcode = #{productBarcode} + and t1.ProductBarcode = #{productBarcode} and SemiBarcode_Line = #{semibarcodeLine} and LineID = #{lineID} and StateFlag = #{stateFlag} - and InsertTime = #{insertTime} + and t1.InsertTime = #{insertTime}