From eab80f6156e37c1a7e908644f59bd711a0040120 Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Sat, 23 Dec 2023 13:33:03 +0800 Subject: [PATCH] =?UTF-8?q?SQL=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 4 ++++ .../controller/LeaseOutDetailsController.java | 12 ++++++++++++ .../app/service/LeaseOutDetailsService.java | 3 +++ .../impl/LeaseOutDetailsServiceImpl.java | 17 ++++++++++++++++- .../bonus/sgzb/base/mapper/MaMachineMapper.java | 2 ++ .../mapper/app/LeaseOutDetailsMapper.xml | 2 +- .../main/resources/mapper/app/TmTaskMapper.xml | 3 +-- .../resources/mapper/base/MaMachineMapper.xml | 17 +++++++++++++++++ 8 files changed, 56 insertions(+), 4 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index f4630c01..3b7d6b19 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -40,6 +40,10 @@ public class LeaseOutDetails implements Serializable { @ApiModelProperty(value = "maId") private Integer maId; + /** 机具编号 */ + @ApiModelProperty(value = "机具编号") + private String maCode; + /** 协议ID */ @ApiModelProperty(value = "协议ID") private String agreementId; 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 c49242bd..597e4426 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 @@ -31,6 +31,18 @@ public class LeaseOutDetailsController extends BaseController { return getDataTable(leaseOutDetailsService.selectListByParentId(taskId)); } + + /** + * 根据code编码查询设备信息 + * @param mCode 机具编码 + * @return 设备信息 + */ + @Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY) + @GetMapping("/getMaMachineByCode") + public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) { + return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode)); + } + /** * 领料出库，对库存处理 * @param record 出库内容 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index c081a9d1..faae8b64 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.app.service; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; +import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import java.util.List; @@ -17,4 +18,6 @@ public interface LeaseOutDetailsService { List selectListByParentId(String parentId); AjaxResult submitOut(LeaseOutDetails record); + + List getMaMachineByCode(String 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 f67c8c61..204ed090 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 @@ -3,6 +3,8 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; +import com.bonus.sgzb.base.api.domain.MaMachine; +import com.bonus.sgzb.base.mapper.MaMachineMapper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; @@ -24,6 +26,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { @Resource private LeaseOutDetailsMapper leaseOutDetailsMapper; + @Resource + private MaMachineMapper maMachineMapper; + /** * 根据任务id查询出库数据 * @param parentId 任务id @@ -44,6 +49,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (StringUtils.isNull(record)) { return AjaxResult.error("领料出库失败,请检查参数是否填写完整!"); } + if (record.getOutNum() == null || record.getOutNum() < 0.1) { + record.setOutNum(1.00); + } // 首先更新领料任务详情表的领料数及状态 int updateLeaseApplyDetailsOutNum = leaseOutDetailsMapper.updateLeaseApplyDetailsOutNum(record); // 插入领料出库明细表 @@ -74,7 +82,14 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("出库操作失败,更新领料数量及状态时出错!"); } - + /** + * @param maMachine + * @return + */ + @Override + public List getMaMachineByCode(String maCode) { + return maMachineMapper.getMaMachineByCode(maCode); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java index 06e8e3bb..03f5ff79 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java @@ -9,6 +9,8 @@ import java.util.List; public interface MaMachineMapper { public List getMaMachine(MaMachine maMachine); + public List getMaMachineByCode(String maCode); + public List getMaMachineList(MaMachine maMachine); public int maMachineAdd(MaMachine maMachine); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 9d78f4e4..b5847b39 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -19,7 +19,7 @@ UPDATE lease_apply_details SET - al_num = al_num + 1, + al_num = al_num + #{record.outNum}, update_by = #{record.updateBy}, diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 9dcb6e28..144a4b80 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -454,7 +454,7 @@ + +