From 518bb466e6e2daf4045d70dc027e68a360957c93 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 25 Mar 2024 17:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 32 +++++++++++++++-- .../sgzb/common/core/utils/StringHelper.java | 2 +- .../controller/LeaseOutDetailsController.java | 8 +++-- .../app/mapper/LeaseOutDetailsMapper.java | 8 ++++- .../app/service/LeaseOutDetailsService.java | 8 ++++- .../impl/LeaseOutDetailsServiceImpl.java | 11 ++++++ .../mapper/app/LeaseOutDetailsMapper.xml | 35 +++++++++++++++++++ 7 files changed, 96 insertions(+), 8 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 2d013d22..3647d661 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 @@ -25,9 +25,25 @@ public class LeaseOutDetails implements Serializable { @ApiModelProperty(value = "id") private Integer id; + /** 父级ID */ + @ApiModelProperty(value = "父级ID") + private Integer parentId; + /** 任务ID */ @ApiModelProperty(value = "任务ID") - private Integer parentId; + private Integer taskId; + + /** 任务编码 */ + @ApiModelProperty(value = "任务编码") + private String code; + + /** 单位名称 */ + @ApiModelProperty(value = "单位名称") + private String unitName; + + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String proName; /** 规格ID */ @ApiModelProperty(value = "规格ID") @@ -49,8 +65,16 @@ public class LeaseOutDetails implements Serializable { @ApiModelProperty(value = "协议ID") private String agreementId; - /** 预领料数 */ - @ApiModelProperty(value = "预领料数") + /** 预领数量 */ + @ApiModelProperty(value = "预领数量") + private Double preNum; + + /** 审批数量 */ + @ApiModelProperty(value = "审批数量") + private Double auditNum; + + /** 出库数量 */ + @ApiModelProperty(value = "出库数量") private Double outNum; /** 出库类型 */ @@ -78,7 +102,9 @@ public class LeaseOutDetails implements Serializable { /** 备注 */ @ApiModelProperty(value = "备注") private String remark; + /** 车牌号 */ + @ApiModelProperty(value = "车牌号") private String carCode; /** 数据所属组织 */ diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java index 66ca58cd..6ef72519 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java @@ -15,7 +15,7 @@ import java.util.regex.Pattern; */ public class StringHelper { - private static String hexString = "0123456789ABCDEF"; + private static final String hexString = "0123456789ABCDEF"; public static String replaceAll(String str, String oldStr, String newStr) { return str.replaceAll(oldStr, newStr); 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 9850ed86..e637ba33 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 @@ -1,7 +1,6 @@ package com.bonus.sgzb.app.controller; import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaMachine; @@ -11,7 +10,6 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import io.swagger.annotations.ApiOperation; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +35,12 @@ public class LeaseOutDetailsController extends BaseController { return getDataTable(leaseOutDetailsService.selectListByParentId(taskId)); } + @Log(title = "领料出库列表", businessType = BusinessType.QUERY) + @GetMapping("/getLeaseOutRecordList") + public TableDataInfo getLeaseList(@RequestBody LeaseOutDetails record) { + return getDataTable(leaseOutDetailsService.leaseOutRecordList(record)); + } + /** * 绑定设备 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index eee8621f..7a100629 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -1,7 +1,6 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; @@ -24,6 +23,13 @@ public interface LeaseOutDetailsMapper { /** 查询出库详情 */ List selectListByParentId(String parentId); + /** + * 领料出库列表 + * @param bean 参数 + * @return 列表 + */ + List leaseOutRecordList(LeaseOutDetails bean); + /** * 修改 （lease_apply_details 领料任务详细表）的已领数量 */ 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 9d0d714d..e40b4ab0 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,7 +1,6 @@ package com.bonus.sgzb.app.service; import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.TmTask; 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; @@ -24,6 +23,13 @@ public interface LeaseOutDetailsService { */ List selectListByParentId(String parentId); + /** + * 领料出库列表 + * @param bean 参数 + * @return 列表 + */ + List leaseOutRecordList(LeaseOutDetails bean); + int bindMachineByRfid(MaMachine maMachine); int bindMachineByQrCode(MaMachine maMachine); 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 bb79d6dc..8925846a 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 @@ -52,6 +52,17 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return leaseOutDetailsMapper.selectListByParentId(parentId); } + /** + * 领料出库列表 + * + * @param bean 参数 + * @return 列表 + */ + @Override + public List leaseOutRecordList(LeaseOutDetails bean) { + return leaseOutDetailsMapper.leaseOutRecordList(bean); + } + @Override @Transactional public int bindMachineByRfid(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 6374f27f..2a657765 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 @@ -349,4 +349,39 @@ insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,is_slt,company_id) values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},'0',#{record.companyId}); + + \ No newline at end of file