From 8d7e961f80a7e7b7b415c19dfa096d79727464d8 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Fri, 22 Dec 2023 11:05:45 +0800 Subject: [PATCH 1/6] =?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 --- .../java/com/bonus/sgzb/material/domain/BackApplyInfo.java | 6 ++++++ .../src/main/resources/mapper/material/BackApplyMapper.xml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index 8f7c8e21..ff52da9d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -155,4 +155,10 @@ public class BackApplyInfo extends BaseEntity { @ApiModelProperty(value = "审核人") private String examineName; + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 9911c103..e8444aca 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -324,6 +324,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bagi.agreement_code like concat('%', #{agreementCode}, '%') + + and bai.back_time >=#{startTime} + and #{endTime} >=bai.back_time + GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time From 308d8e343c0c9a851f8a7729c3656b78e8b3b358 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 22 Dec 2023 11:21:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RepairTestInputController.java | 13 ++- .../material/domain/RepairTestInputDto.java | 8 +- .../mapper/material/RepairTestInputMapper.xml | 79 +++++++++++-------- 3 files changed, 60 insertions(+), 40 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index 42231774..29906da7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -9,10 +9,7 @@ import com.bonus.sgzb.material.domain.RepairTestInputVo; import com.bonus.sgzb.material.service.RepairTestInputService; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -29,16 +26,16 @@ public class RepairTestInputController extends BaseController { private RepairTestInputService service; @ApiOperation(value = "获取修试后入库列表") - @PostMapping("getRepairedList") - public TableDataInfo getRepairedList(@Validated @RequestBody RepairTestInputDto dto){ + @GetMapping("getRepairedList") + public TableDataInfo getRepairedList(RepairTestInputDto dto){ startPage(); List list = service.getRepairedList(dto); return getDataTable(list); } @ApiOperation(value = "获取修试后入库列表-详情") - @PostMapping("getRepairedDetailList") - public TableDataInfo getRepairedDetailList(@Validated @RequestBody RepairTestInputDto dto){ + @GetMapping("getRepairedDetailList") + public TableDataInfo getRepairedDetailList(RepairTestInputDto dto){ startPage(); List list = service.getRepairedDetailList(dto); return getDataTable(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java index 3e51867d..4fcf1693 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java @@ -7,7 +7,7 @@ import lombok.Data; * 修试入库-前端传参 */ @Data -public class RepairTestInputDto { +public class RepairTestInputDto{ /** 任务id*/ private int taskId; @@ -18,4 +18,10 @@ public class RepairTestInputDto { /** 状态*/ private String status; + /** 设备类型*/ + private String deviceTypeId; + + /** 规格型号*/ + private String typeId; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index 4f446cbf..33373f26 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -58,34 +58,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From 1bbfc1dd731f8d4660a0f236ae59198bab14fde5 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 22 Dec 2023 12:32:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/domain/RepairTestInputDto.java | 3 +++ .../mapper/material/RepairTestInputMapper.xml | 27 ++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java index 4fcf1693..038cd974 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java @@ -24,4 +24,7 @@ public class RepairTestInputDto{ /** 规格型号*/ private String typeId; + /** 维修时间*/ + private String wxTime; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index 33373f26..1af4aea7 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -67,8 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ( SELECT ANY_VALUE(rid.task_id) AS id, ANY_VALUE(tt2.`code`) AS repairCode, - ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName)) AS maTypeName, - ANY_VALUE(GROUP_CONCAT(DISTINCT a.type_id)) AS type_id, + ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName, + ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2, ANY_VALUE(tt2.create_by) AS wxName, ANY_VALUE(tt2.create_time) AS wxTime, ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus @@ -77,27 +77,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dic sd ON tt.task_status = sd.id LEFT JOIN tm_task tt2 ON rid.repair_id = tt2.task_id LEFT JOIN ( - SELECT mt2.type_id,mt2.type_name AS typeName,mt.manage_type + SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2 FROM ma_type mt LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' WHERE mt.`level` = '4' - )a ON rid.type_id = a.type_id - - - ( - INSTR(tt.`code`,#{keyWord}) > 0 OR - INSTR(tt2.create_by,#{keyWord}) > 0 - ) - - + )a ON rid.type_id = a.typeId GROUP BY rid.task_id ORDER BY tt.create_time DESC ) b - INSTR(b.type_id,#{deviceTypeId}) > 0 + INSTR(b.typeId2,#{deviceTypeId}) > 0 + + + AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59') + + + AND ( + INSTR(b.repairCode,#{keyWord}) > 0 OR + INSTR(b.wxName,#{keyWord}) > 0 + ) From f92c7f44899efdd86d53f578e71ee57517351e5b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 22 Dec 2023 13:40:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/controller/RepairTestInputController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index 29906da7..6e66c4ef 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -43,7 +43,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "修试后入库-入库操作") @PostMapping("inputByType") - public AjaxResult inputByType(@Validated @RequestBody String params){ + public AjaxResult inputByType(String params){ return service.inputByType(params); } } From 54a6c380d0679c78b2f2df6fb210e498951b48b6 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 22 Dec 2023 13:43:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/controller/RepairTestInputController.java | 4 ++-- .../com/bonus/sgzb/material/domain/RepairTestInputDto.java | 2 ++ .../bonus/sgzb/material/service/RepairTestInputService.java | 2 +- .../material/service/impl/RepairTestInputServiceImpl.java | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index 6e66c4ef..a8448a26 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -43,7 +43,7 @@ public class RepairTestInputController extends BaseController { @ApiOperation(value = "修试后入库-入库操作") @PostMapping("inputByType") - public AjaxResult inputByType(String params){ - return service.inputByType(params); + public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){ + return service.inputByType(dto); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java index 038cd974..b6f3d627 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java @@ -27,4 +27,6 @@ public class RepairTestInputDto{ /** 维修时间*/ private String wxTime; + private String params; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java index 17347552..3fae5737 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java @@ -37,5 +37,5 @@ public interface RepairTestInputService { * @author cwchen * @date 2023/12/16 18:35 */ - AjaxResult inputByType(String params); + AjaxResult inputByType(RepairTestInputDto dto); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java index 98817c5f..07309a84 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java @@ -47,12 +47,12 @@ public class RepairTestInputServiceImpl implements RepairTestInputService { @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult inputByType(String params) { + public AjaxResult inputByType(RepairTestInputDto repairTestInputDto) { try { - if (StringUtils.isEmpty(params)) { + if (StringUtils.isEmpty(repairTestInputDto.getParams())) { return AjaxResult.error(HttpStatus.ERROR, "参数不正确"); } - List list = JSONObject.parseArray(params, RepairTestWarehousingDto.class); + List list = JSONObject.parseArray(repairTestInputDto.getParams(), RepairTestWarehousingDto.class); if(CollectionUtils.isEmpty(list)){ return AjaxResult.error(HttpStatus.ERROR, "参数不正确"); } From 54eed165b5475a0fb78f7f5ce36349d2ff0a0ca5 Mon Sep 17 00:00:00 2001 From: gmhao <1285330039@qq.com> Date: Fri, 22 Dec 2023 13:56:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/mapper/MaLabelBindMapper.java | 1 + .../service/impl/MaLabelBindServiceImpl.java | 4 ++++ .../impl/MaMachineLabelServiceImpl.java | 1 + .../mapper/base/MaLabelBindMapper.xml | 19 +++++++++++++------ .../mapper/base/MaMachineLabelMapper.xml | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java index 80a00b89..1d1ff479 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java @@ -75,6 +75,7 @@ public interface MaLabelBindMapper */ public int updateMaLabelBindByMaIds(Long id); + public int updateMaLabelBindMaIds(MaLabelBindVO maLabelBindVO); MaLabelBindVO selectMaMachineMaId(String maCode); int insertLabelBind(MaLabelBind maLabelBind); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java index acb3dbed..c4493f64 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java @@ -67,10 +67,14 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService public int insertMaLabelBind(MaLabelBindVO maLabelBind) { int i = 0; + int b =0; MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode()); if(StringHelper.isNotEmpty(bean.getMaId())){ maLabelBind.setMaId(bean.getMaId()); + maLabelBind.setTypeId(bean.getTypeId()); maLabelBind.setStatus("1"); + maLabelBind.setIsBind("1"); + b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind); i = maLabelBindMapper.insertMaLabelBindS(maLabelBind); } return i ; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineLabelServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineLabelServiceImpl.java index 2d4e9167..2320c25e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineLabelServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineLabelServiceImpl.java @@ -54,6 +54,7 @@ public class MaMachineLabelServiceImpl implements IMaMachineLabelService code = format + "-000" + lableNum; } lableNum++; + maMachineLabel.setIsBind("0"); maMachineLabel.setLabelCode(code); maMachineLabelMapper.insertMaMachineLabel(maMachineLabel); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml index 8efe6b10..33ffaf8e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml @@ -33,7 +33,7 @@ - select ma_id as maId + select ma_id as maId,type_id as typeId from ma_machine where ma_code = #{maCode} + + update ma_machine_label set + ma_id = #{maId},is_bind =#{isBind} + where label_id =#{labelId} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineLabelMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineLabelMapper.xml index cb4fa474..28b40bd5 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineLabelMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineLabelMapper.xml @@ -13,7 +13,7 @@ - select label_id, label_code, type_id, is_bind, label_type, company_id + select label_id, label_code, ma_id, is_bind, label_type, company_id from ma_machine_label