From b87c91473946009a31df19eabb77de1239e43c7c Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Sat, 23 Dec 2023 15:24:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?maCode=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/LeaseOutDetailsController.java | 6 +++--- .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java | 4 ++-- .../src/main/resources/mapper/base/MaMachineMapper.xml | 5 +---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 597e4426..44bdd5f1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -34,13 +34,13 @@ public class LeaseOutDetailsController extends BaseController { /** * 根据code编码查询设备信息 - * @param mCode 机具编码 + * @param maCode 机具编码 * @return 设备信息 */ @Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY) @GetMapping("/getMaMachineByCode") - public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) { - return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode)); + public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String maCode) { + return getDataTable(leaseOutDetailsService.getMaMachineByCode(maCode)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 204ed090..e856eba9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -83,8 +83,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } /** - * @param maMachine - * @return + * @param maCode 编码ID + * @return 数据 */ @Override public List getMaMachineByCode(String maCode) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 0d3c7320..745aa5fa 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -69,10 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt2 on mt1.parent_id = mt2.type_id left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id - - m.ma_code = #{maCode} - - order by m.ma_id desc + where m.ma_code = #{maCode} From 49e1b410b6ceef09b47a37a505335a8ad70933d7 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Sat, 23 Dec 2023 15:36:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/domain/BackApplyInfo.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 57bcff3d..d3bbe862 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.domain; +import io.swagger.models.auth.In; import lombok.Data; /** @@ -86,8 +87,46 @@ public class BackApplyInfo { private String lotId; private String unitId; private String backTime; + private Integer maId; /** * 机具管理方式 */ private String manageType; + /** + * 合格数量 + */ + private Integer passNum; + /** + * 维修数量 + */ + private Integer maintenanceNum; + /** + * 报废数量 + */ + private Integer scrapNum; + + /** + * 退料数量 + */ + private Integer backNum; + + /** + * 退料数量 + */ + private String backStatus; + + /** + * 合格入库数量 + */ + private String inputNum; + + /** + * 任务类型 + */ + private Integer taskType; + + /** + * 任务id + */ + private Integer taskId; } From a22ee17c232265e10fd806a00ca094a8ec0c44a9 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Sat, 23 Dec 2023 15:55:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/controller/BackApplyController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 1177bc8b..08e98bf0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -52,7 +52,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "获取在用物料列表") @GetMapping("/getMaterialList") - public TableDataInfo getMaterialList(@RequestBody BackApplyInfo bean) + public TableDataInfo getMaterialList(BackApplyInfo bean) { startPage(); List list = backApplyService.getMaterialList(bean); @@ -64,7 +64,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "退料申请详情") @GetMapping("/getView") - public TableDataInfo getView(@RequestBody BackApplyInfo bean) + public TableDataInfo getView(BackApplyInfo bean) { startPage(); List list = backApplyService.getView(bean); @@ -86,7 +86,7 @@ public class BackApplyController extends BaseController { */ @ApiOperation(value = "退料申请删除") @GetMapping("/del") - public AjaxResult del(@RequestBody BackApplyInfo bean) + public AjaxResult del(BackApplyInfo bean) { return backApplyService.del(bean); }