From 60e10fcdb5fa5b1f3f423613cecb9f517dd746d5 Mon Sep 17 00:00:00 2001 From: "1539530615@qq.com" <1539530615@qq.com> Date: Mon, 4 Mar 2024 16:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaMachine.java | 39 +++++++++++++-- .../controller/LeaseOutDetailsController.java | 1 - .../base/controller/MaMachineController.java | 7 +++ .../sgzb/base/mapper/MaMachineMapper.java | 7 +++ .../sgzb/base/service/MaMachineService.java | 1 + .../service/impl/MaMachineServiceImpl.java | 25 ++++++++++ .../resources/mapper/base/MaMachineMapper.xml | 48 +++++++++++++++++++ 7 files changed, 124 insertions(+), 4 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java index fb4077ae..0d42ab3d 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java @@ -177,13 +177,46 @@ public class MaMachine extends BaseEntity { @ApiModelProperty(value = "仓库名称") private String ownHouseName; - @ApiModelProperty(value = "仓库id") private Long houseId; - - @ApiModelProperty(value = "厂家名称") private String supplier; + /** + * 检验人员 + */ + private String inspectMan; + /** + * 检验结论 + */ + private String inspectStatus; + /** + * 联系电话 + */ + private String phone; + /** + * 领料单位 + */ + private String leaseUnit; + /** + * 领料工程 + */ + private String leasePro; + /** + * 领料时间 + */ + private String leaseTime; + /** + * 退料单位 + */ + private String backUnit; + /** + * 退料工程 + */ + private String backPro; + /** + * 退料时间 + */ + private String backTime; } 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 5c8de556..d6c917eb 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 @@ -108,7 +108,6 @@ public class LeaseOutDetailsController extends BaseController { @Log(title = "领料出库", businessType = BusinessType.UPDATE) @PostMapping("/submitOutRfid") public AjaxResult submitOutRfid(@RequestBody List recordList) { - return leaseOutDetailsService.submitOutRfid(recordList); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java index ffaeb008..782723c7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java @@ -37,6 +37,13 @@ public class MaMachineController extends BaseController { return success(list); } + @Log(title = "根据二维码查询机具设备", businessType = BusinessType.QUERY) + @GetMapping("/getMachineByQrCode") + public AjaxResult getMachineByQrCode(MaMachine maMachine) { + MaMachine ma = maMachineService.getMachineByQrCode(maMachine); + return success(ma); + } + /** * 根据条件进行查询机具设备管理 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 873cbac8..65050df1 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 @@ -1,6 +1,8 @@ package com.bonus.sgzb.base.mapper; import com.bonus.sgzb.base.api.domain.MaMachine; +import com.bonus.sgzb.base.api.domain.SltAgreementApply; +import com.bonus.sgzb.base.domain.BmProjectLot; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -34,4 +36,9 @@ public interface MaMachineMapper { List getMaMachineByRfidCode(String rfidCode); + MaMachine getMachineByQrCode(MaMachine maMachine); + + SltAgreementApply getLeaseProject(MaMachine ma); + + SltAgreementApply getBackProject(MaMachine ma); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java index c13de56d..d48f15b1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java @@ -21,4 +21,5 @@ public interface MaMachineService { */ public MaMachine selectMaMachineByMaId(Long maId); + MaMachine getMachineByQrCode(MaMachine maMachine); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index 1d5649ff..3805d780 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -3,12 +3,15 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.base.api.domain.MaLabelBind; +import com.bonus.sgzb.base.api.domain.SltAgreementApply; +import com.bonus.sgzb.base.domain.BmProjectLot; import com.bonus.sgzb.base.domain.MaPropSet; import com.bonus.sgzb.base.mapper.MaLabelBindMapper; import com.bonus.sgzb.base.mapper.MaMachineMapper; import com.bonus.sgzb.base.mapper.MaPropInfoMapper; import com.bonus.sgzb.base.mapper.MaTypeMapper; import com.bonus.sgzb.base.service.MaMachineService; +import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.security.utils.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -118,4 +121,26 @@ public class MaMachineServiceImpl implements MaMachineService { { return maMachineMapper.selectMaMachineByMaId(maId); } + + @Override + public MaMachine getMachineByQrCode(MaMachine maMachine) { + MaMachine ma = maMachineMapper.getMachineByQrCode(maMachine); + if(ma != null){ + SltAgreementApply leaseProject = maMachineMapper.getLeaseProject(ma); + SltAgreementApply backProject = maMachineMapper.getBackProject(ma); + if (leaseProject != null){ + ma.setLeaseUnit(leaseProject.getUnitName()); + ma.setLeasePro(leaseProject.getProjectName()); + ma.setLeaseTime(leaseProject.getCreateTime()); + } + if (backProject != null){ + ma.setBackUnit(backProject.getUnitName()); + ma.setBackPro(backProject.getProjectName()); + ma.setBackTime(backProject.getCreateTime()); + } + }else { + throw new ServiceException("二维码对应机具信息无效"); + } + return ma; + } } 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 06ee7ff2..52c63d43 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 @@ -299,4 +299,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + \ No newline at end of file