From 6ca468fbf113c6f1391ea1cb61e7d8814415f4f5 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Wed, 14 Jan 2026 15:52:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?jsk=20=20=E9=A2=86=E6=96=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyQuery.java | 87 ++++++++++++++ .../back/domain/vo/BackApplyQuery.java | 82 ++++++++++++++ .../controller/LeaseApplyInfoController.java | 30 ++++- .../lease/mapper/LeaseApplyInfoMapper.java | 13 ++- .../lease/service/ILeaseApplyInfoService.java | 7 +- .../impl/LeaseApplyInfoServiceImpl.java | 6 +- .../material/lease/LeaseApplyInfoMapper.xml | 107 ++++++++++++++++++ 7 files changed, 322 insertions(+), 10 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyQuery.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyQuery.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyQuery.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyQuery.java new file mode 100644 index 00000000..86d014f3 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyQuery.java @@ -0,0 +1,87 @@ +package com.bonus.common.biz.domain.lease; + +import com.bonus.common.biz.domain.BmFileInfo; +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.Set; + +/** + * 领料任务对象 lease_apply_info + * + * @author xsheng + * @date 2024-10-16 + */ + +@EqualsAndHashCode(callSuper = false) +@Data +@ToString +public class LeaseApplyQuery extends BaseEntity{ + + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + @ApiModelProperty(value = "分公司") + @Excel(name = "分公司") + private String deptName; + + @ApiModelProperty(value = "单位名称") + @Excel(name = "单位名称") + private String unitName; + + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String proName; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "物资名称") + private String typeName; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String modelName; + + @ApiModelProperty(value = "出库数量") + @Excel(name = "出库数量") + private String outNum; + + @ApiModelProperty(value = "物资编码") + @Excel(name = "物资编码") + private String maCode; + + @ApiModelProperty(value = "出库日期") + @Excel(name = "出库日期") + private String outTime; + + @ApiModelProperty(value = "机具类型") + @Excel(name = "机具类型") + private String jijuType; + + @ApiModelProperty(value = "领料单号") + @Excel(name = "领料单号") + private String code; + + @ApiModelProperty(value = "领料人") + @Excel(name = "领料人") + private String leasePerson; + + private String keyWord; + private Long companyId; + private String startTime; + private String endTime; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyQuery.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyQuery.java new file mode 100644 index 00000000..24012ccb --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyQuery.java @@ -0,0 +1,82 @@ +package com.bonus.material.back.domain.vo; + +import com.bonus.common.biz.domain.lease.LeaseOutSign; +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import lombok.experimental.Accessors; + +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 退料任务对象 back_apply_info + * + * @author xsheng + * @date 2024-10-16 + */ + +@Accessors(chain = true) +@Data +@ToString +public class BackApplyQuery extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + @ApiModelProperty(value = "协议号") + @Excel(name = "协议号") + private String agreementCode; + + @ApiModelProperty(value = "分公司") + @Excel(name = "分公司") + private String deptName; + + @ApiModelProperty(value = "单位名称") + @Excel(name = "单位名称") + private String unitName; + + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String proName; + + @ApiModelProperty(value = "退料单号") + @Excel(name = "退料单号") + private String code; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "物资名称") + private String typeName; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String modelName; + + @ApiModelProperty(value = "退料数量") + @Excel(name = "退料数量") + private String backNum; + + @ApiModelProperty(value = "退料日期") + @Excel(name = "退料日期") + private String inTime; + + @ApiModelProperty(value = "机具类型") + @Excel(name = "机具类型") + private String jijuType; + + private String leasePerson; + + private String keyWord; + private Long companyId; + private String startTime; + private String endTime; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index c95eb996..9568055b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -176,7 +176,7 @@ public class LeaseApplyInfoController extends BaseController { @PreventRepeatSubmit //@RequiresPermissions("lease:info:export") @SysLog(title = "领料出库", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料出库") - @PostMapping("/exportLeaseOutRecord") + @PostMapping("/back_apply_info") public void exportLeaseOutRecord(HttpServletResponse response, LeaseApplyInfo leaseApplyInfo) { Long deptId = typeService.getUserDeptId(); leaseApplyInfo.setCompanyId(deptId); @@ -605,4 +605,32 @@ public class LeaseApplyInfoController extends BaseController { public AjaxResult updateLeaseNum(@RequestBody LeaseApplyDetails leaseApplyDetails) { return leaseApplyInfoService.updateLeaseNum(leaseApplyDetails); } + + /** + * 查询领料任务列表 + */ + @ApiOperation(value = "查询领料查询列表") + @GetMapping("/queryList") + public AjaxResult queryList(LeaseApplyQuery leaseApplyQuery) { + Long deptId = typeService.getUserDeptId(); + leaseApplyQuery.setCompanyId(deptId); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); + List list = leaseApplyInfoService.selectLeaseApplyQueryList(leaseApplyQuery); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + } + + @ApiOperation(value = "导出领料查询列表") + @PreventRepeatSubmit + //@RequiresPermissions("lease:info:export") + @SysLog(title = "领料查询", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料查询") + @PostMapping("/exportLeaseQueryOutRecord") + public void exportLeaseQueryOutRecord(HttpServletResponse response, LeaseApplyQuery leaseApplyQuery) { + Long deptId = typeService.getUserDeptId(); + leaseApplyQuery.setCompanyId(deptId); + List list = leaseApplyInfoService.selectLeaseApplyQueryList(leaseApplyQuery); + List exportList = new ArrayList<>(); + ExcelUtil util = new ExcelUtil<>(LeaseApplyQuery.class); + util.exportExcel(response, list, "领料查询"); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index ee1d81b1..85168ba5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -2,10 +2,8 @@ package com.bonus.material.lease.mapper; import java.math.BigDecimal; import java.util.List; -import com.bonus.common.biz.domain.lease.LeaseApplyInfo; -import com.bonus.common.biz.domain.lease.LeaseConfirmSign; -import com.bonus.common.biz.domain.lease.LeaseOutDetails; -import com.bonus.common.biz.domain.lease.LeaseOutSign; + +import com.bonus.common.biz.domain.lease.*; import com.bonus.material.lease.domain.LeaseApplyDetails; import org.apache.ibatis.annotations.Param; @@ -354,4 +352,11 @@ public interface LeaseApplyInfoMapper { * @return */ List selectLeaseApplyInfoByParentId(Long id); + + /** + * + * @param leaseApplyQuery + * @return + */ + List selectLeaseApplyQueryList(LeaseApplyQuery leaseApplyQuery); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java index afc44250..ce418a2d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java @@ -3,14 +3,11 @@ package com.bonus.material.lease.service; import java.util.Date; import java.util.List; -import com.bonus.common.biz.domain.lease.LeaseApplyDetailExport; -import com.bonus.common.biz.domain.lease.LeaseOutDetails; +import com.bonus.common.biz.domain.lease.*; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.material.basic.domain.BmQrcodeInfo; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; -import com.bonus.common.biz.domain.lease.LeaseOutRequestVo; import org.apache.ibatis.annotations.Param; import javax.servlet.http.HttpServletResponse; @@ -212,4 +209,6 @@ public interface ILeaseApplyInfoService { List getOutInfo(LeaseApplyInfo bean); List selectLeaseApplyDetailList(LeaseApplyInfo leaseApplyInfo); + + List selectLeaseApplyQueryList(LeaseApplyQuery leaseApplyQuery); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 19cb6c36..edbad879 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1376,7 +1376,11 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } return listAll; } - + + @Override + public List selectLeaseApplyQueryList(LeaseApplyQuery leaseApplyQuery) { + return leaseApplyInfoMapper.selectLeaseApplyQueryList(leaseApplyQuery); + } /** * 关键字搜索 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 6bb75856..52c60e25 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -1344,4 +1344,111 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.is_rs = 1 AND lad.parent_id = #{id} + + + From f542f7cc79d1e5b5678b28449acbf46dfb5f8619 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Wed, 14 Jan 2026 16:10:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?jsk=20=20=E9=80=80=E6=96=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BackApplyInfoController.java | 28 ++++++++++- .../back/mapper/BackApplyInfoMapper.java | 7 ++- .../back/service/IBackApplyInfoService.java | 3 ++ .../impl/BackApplyInfoServiceImpl.java | 6 +++ .../material/back/BackApplyInfoMapper.xml | 46 +++++++++++++++++++ 5 files changed, 85 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java index 3bbe2d0d..fd11cff8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import com.bonus.common.biz.config.ListPagingUtil; +import com.bonus.common.biz.domain.lease.LeaseApplyQuery; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.ServletUtils; @@ -736,6 +737,31 @@ public class BackApplyInfoController extends BaseController { util.exportExcel(response, list, fileName, title); } + /** + * 查询退料任务列表 + */ + @ApiOperation(value = "查询退料查询列表") +// @RequiresPermissions("back:info:list") + @GetMapping("/queryList") + public AjaxResult queryList(BackApplyQuery backApplyQuery) { + Long deptId = typeService.getUserDeptId(); + backApplyQuery.setCompanyId(deptId); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); + List list = backApplyInfoService.selectBackApplyQueryList(backApplyQuery); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + } - + @ApiOperation(value = "导出退料查询列表") + @PreventRepeatSubmit + //@RequiresPermissions("lease:info:export") + @SysLog(title = "退料查询", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出退料查询") + @PostMapping("/exportBackQueryOutRecord") + public void exportBackQueryOutRecord(HttpServletResponse response, BackApplyQuery backApplyQuery) { + Long deptId = typeService.getUserDeptId(); + backApplyQuery.setCompanyId(deptId); + List list = backApplyInfoService.selectBackApplyQueryList(backApplyQuery); + ExcelUtil util = new ExcelUtil<>(BackApplyQuery.class); + util.exportExcel(response, list, "退料查询"); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java index 44b2c491..7c935a4c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java @@ -6,10 +6,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.back.domain.*; -import com.bonus.material.back.domain.vo.BackApplyInfoVo; -import com.bonus.material.back.domain.vo.BackApplyVo; -import com.bonus.material.back.domain.vo.BackExportDetailsVo; -import com.bonus.material.back.domain.vo.MaCodeVo; +import com.bonus.material.back.domain.vo.*; import com.bonus.material.basic.domain.BmAgreementInfo; import com.bonus.material.clz.domain.back.MaterialBackApplyDetails; import com.bonus.material.settlement.domain.SltAgreementInfo; @@ -584,4 +581,6 @@ public interface BackApplyInfoMapper { * @return */ List getXmInfoList(BackApplyInfo bean); + + List selectBackApplyQueryList(BackApplyQuery backApplyQuery); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java index 26c91459..63eb881b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java @@ -272,5 +272,8 @@ public interface IBackApplyInfoService { * @return */ List exportBackDetailsList(BackApplyInfo dto); + + + List selectBackApplyQueryList(BackApplyQuery backApplyQuery); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index e5e473b2..4d1a88db 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.biz.constant.GlobalConstants; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.TypeTreeNode; +import com.bonus.common.biz.domain.lease.LeaseApplyQuery; import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.common.biz.domain.lease.LeaseOutSign; import com.bonus.common.biz.enums.*; @@ -446,6 +447,11 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { } } + @Override + public List selectBackApplyQueryList(BackApplyQuery backApplyQuery) { + return backApplyInfoMapper.selectBackApplyQueryList(backApplyQuery); + } + /** * 检查是否有编码设备 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 1292c251..398f062a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -1959,4 +1959,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by start_time asc + + + From da7052f4bb1160a3c4d99b0e83f619dfcf827435 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Wed, 14 Jan 2026 17:32:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmUnitController.java | 14 ++++++++++++-- .../ma/service/impl/WarehousingServiceImpl.java | 3 +++ .../mapper/material/ma/WarehousingMapper.xml | 7 ++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java index 65e18f98..e0d72ac9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java @@ -4,10 +4,13 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; +import com.bonus.material.basic.domain.BmUnitPerson; +import com.bonus.material.basic.service.IBmUnitPersonService; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.ma.service.ITypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +32,7 @@ import com.bonus.common.core.web.page.TableDataInfo; /** * 往来单位管理Controller - * + * * @author xsheng * @date 2024-09-27 */ @@ -44,6 +47,9 @@ public class BmUnitController extends BaseController @Autowired private ITypeService typeService; + @Autowired + private IBmUnitPersonService bmUnitPersonService; + /** * 查询往来单位管理列表 */ @@ -69,7 +75,11 @@ public class BmUnitController extends BaseController { Long deptId = typeService.getUserDeptId(); bmUnit.setCompanyId(deptId); - List list = bmUnitService.selectBmUnitList(bmUnit); + // List list = bmUnitService.selectBmUnitList(bmUnit); + BmUnitPerson bmUnitPerson = new BmUnitPerson(); + bmUnitPerson.setCompanyId(deptId+""); + BeanUtils.copyProperties(bmUnit, bmUnitPerson); + List list = bmUnitPersonService.selectBmUnitList(bmUnitPerson); ExcelUtil util = new ExcelUtil(BmUnit.class); util.exportExcel(response, list, "往来单位管理数据"); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java index 30127a8f..792ae995 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java @@ -45,6 +45,7 @@ public class WarehousingServiceImpl implements WarehousingService { @Resource private TypeMapper typeMapper; + // @Autowired // private PurchaseInputMapper purchaseInputMapper; @@ -61,6 +62,8 @@ public class WarehousingServiceImpl implements WarehousingService { @Override public List selectMaSupplierInfoList(SupplierInfo maSupplierInfo) { + Long companyId=typeService.getUserDeptId(); + maSupplierInfo.setCompanyId(companyId+""); return warehousingMapper.selectMaSupplierInfoList(maSupplierInfo); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml index 6de5cdf4..1ad5087c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/WarehousingMapper.xml @@ -37,6 +37,11 @@ supplier_id as supplierId , supplier as supplier FROM ma_supplier_info + + + and company_id = #{companyId} + + - \ No newline at end of file +