From d0d2904e1552919418562e4bf89570b9a7d374f7 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 28 Aug 2025 21:25:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WsMaInfoController.java | 24 +++++++++++++++++-- .../codeCollection/domain/WsMaInfo.java | 8 +++++++ .../codeCollection/mapper/WsMaInfoMapper.java | 14 +++++++++++ .../service/WsMaInfoService.java | 7 ++++++ .../service/impl/WsMaInfoServiceImpl.java | 18 ++++++++++++++ .../codeCollection/WsMaInfoMapper.xml | 15 ++++++++++++ 6 files changed, 84 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java index 3a7752a3..7b101472 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/controller/WsMaInfoController.java @@ -1,5 +1,6 @@ package com.bonus.material.codeCollection.controller; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -9,12 +10,11 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.service.WsMaInfoService; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.ma.domain.Machine; -import com.bonus.material.ma.domain.vo.MachineVo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -106,4 +106,24 @@ public class WsMaInfoController extends BaseController { List list = service.getGadgetList(info); return getDataTable(list); } + + + /** + * 导出小工具编码信息列表 + */ + @ApiOperation(value = "导出小工具编码信息列表") + @SysLog(title = "小工具编码信息管理", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出小工具编码信息列表") + @PostMapping("/exportGadgetList") + public void exportGadgetList(HttpServletResponse response, WsMaInfo info) { + List list = service.getGadgetList(info); + ExcelUtil util = new ExcelUtil<>(WsMaInfo.class); + util.exportExcel(response, list, "领料出库数据"); + } + + @ApiOperation(value = "新增小工具编码信息") + @SysLog(title = "新增小工具编码信息", businessType = OperaType.INSERT, logType = 1, module = "小工具编码信息管理->新增") + @PostMapping("/addWsMaInfoData") + public AjaxResult addWsMaInfoData(@RequestBody WsMaInfo info) { + return service.addWsMaInfoData(info); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/domain/WsMaInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/domain/WsMaInfo.java index d9d78c44..4350bbc5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/domain/WsMaInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/domain/WsMaInfo.java @@ -1,5 +1,6 @@ package com.bonus.material.codeCollection.domain; +import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -28,16 +29,19 @@ public class WsMaInfo { /** * 机具名称，如“电焊机”、“搅拌机” */ + @Excel(name = "设备类型") private String maName; /** * 机具型号，例如“WX-3000” */ + @Excel(name = "规格型号") private String maModel; /** * 机具编号，企业内部唯一标识编号 */ + @Excel(name = "设备编号") private String maCode; /** @@ -48,21 +52,25 @@ public class WsMaInfo { /** * 本次检验时间，格式建议为 yyyy-MM-dd */ + @Excel(name = "本次检验时间") private String thisCheckTime; /** * 下次检验时间，格式建议为 yyyy-MM-dd */ + @Excel(name = "下次检验时间") private String nextCheckTime; /** * 检修员姓名，表示最近一次负责检修的人员 */ + @Excel(name = "检修员") private String repairMan; /** * 检验员姓名，表示本次设备检验的执行人员 */ + @Excel(name = "检验员") private String checkMan; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java index e1063f6a..a4fe6f56 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/mapper/WsMaInfoMapper.java @@ -100,4 +100,18 @@ public interface WsMaInfoMapper { * @return 机具信息集合 */ List getGadgetList(WsMaInfo info); + + /** + * 新增机具信息 + * @param info 机具信息 + * @return 条数 + */ + int addWsMaInfoData(WsMaInfo info); + + /** + * 根据编码查询机具信息 + * @param info 查询条件 + * @return 机具信息集合 + */ + int selectCountByCode(WsMaInfo info); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java index 3ef70f2b..dce7612a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/WsMaInfoService.java @@ -92,4 +92,11 @@ public interface WsMaInfoService { * @return */ List getGadgetList(WsMaInfo info); + + /** + * 新增小工具编码信息 + * @param info + * @return + */ + AjaxResult addWsMaInfoData(WsMaInfo info); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java index 83cacede..a59c6746 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/codeCollection/service/impl/WsMaInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.material.codeCollection.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.codeCollection.mapper.WsMaInfoMapper; import com.bonus.material.codeCollection.service.WsMaInfoService; @@ -220,4 +221,21 @@ public class WsMaInfoServiceImpl implements WsMaInfoService { return new ArrayList<>(); } } + + @Override + public AjaxResult addWsMaInfoData(WsMaInfo info) { + try { + info.setOptUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + //查询是否存在 + int count = mapper.selectCountByCode(info); + if (count > 0){ + return AjaxResult.error("该类型下此编码已存在"); + } + int i = mapper.addWsMaInfoData(info); + return i > 0 ? AjaxResult.success("添加小工具编码信息列表成功") : AjaxResult.error("添加小工具编码信息列表失败"); + } catch (Exception e) { + log.error("添加小工具编码信息列表：", e.getMessage()); + return AjaxResult.error("添加小工具编码信息列表失败"); + } + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml index 3ed24f7b..f69b555d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml @@ -151,6 +151,14 @@ ]]> + + + INSERT INTO ws_ma_info (ma_name, ma_model, ma_code, this_check_time, next_check_time, + repair_man, check_man, phone, result, model_id, is_active, opt_user, opt_time) + VALUES (#{maName}, #{maModel}, #{maCode}, #{thisCheckTime}, + #{nextCheckTime}, + #{repairMan}, #{checkMan}, #{phone}, #{result}, #{modelId}, '1', #{optUser}, now()) + UPDATE ws_ma_info From 648265111108ca11b49c5b29c65dd621100f3605 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Fri, 29 Aug 2025 11:04:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=AE=B1=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/impl/BmQrBoxServiceImpl.java | 10 +++++++++- .../com/bonus/material/ma/mapper/MachineMapper.java | 3 +++ .../resources/mapper/material/basic/BmQrBoxMapper.xml | 2 +- .../resources/mapper/material/ma/MachineMapper.xml | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 4c93094a..d70d1f5f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -787,7 +787,15 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { private int updateStorageNum(BoxBindWarehouseDto boxMa) { int result = 0; - result = bmQrBoxMapper.updateStorageNum(boxMa); + + + String maStatus = boxMa.getMaStatus(); + if("0".equals(maStatus)){ + boxMa.setInputNum(BigDecimal.valueOf(1)); + result = bmQrBoxMapper.updateStorageNum(boxMa); + result = machineMapper.updateMaStatus(boxMa); + } + return result; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index 0564c61b..9a4079fb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.basic.domain.BmQrBoxInfo; +import com.bonus.material.basic.domain.dto.BoxBindWarehouseDto; import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MachineVo; @@ -222,4 +223,6 @@ public interface MachineMapper int batchUpdateSynchReport(@Param("list") List samples); int editMachineStatus(Machine machine); + + int updateMaStatus(BoxBindWarehouseDto boxMa); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index d2e89eb4..9fa8eae4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -442,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ma_type set storage_num = storage_num + #{inputNum} where type_id = #{maTypeId} + update ma_type set storage_num = ifnull(storage_num,0) + #{inputNum} where type_id = #{maTypeId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index cb51c0d0..1f5c9b92 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -990,4 +990,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join bm_project bp on bai.project_id = bp.pro_id where ba.id = #{parentId} + + + update ma_machine set ma_status = 1 where ma_id = #{maId} +