diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index cb258c5438..23cc4b4d7f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -236,11 +236,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); //推送资金占用费收款凭证 + Future future1 = pool.submit(() -> { + pushFundVoucher(v, sid); + }); + //推送资金占用费收款凭证 Future future = pool.submit(() -> { pushFeeVoucher(v, sid); }); @@ -3917,22 +3910,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); BigDecimal a3 = baseMapper.selectA3(stringList); @@ -3961,7 +3954,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService=0){ + if (yAll.compareTo(unall) >= 0) { LoanSettleApply loanSettleApply = baseMapper.selectApply(busVinSid); LoanSettleBankCost loanSettleBankCost = baseMapper.selectMainSid(loanSettleApply.getSid()); LoanFinBank loanFinBank = baseMapper.selectByBanks(loanSettleApply.getSaleOrderSid()); @@ -3996,8 +3989,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java index 2a8cb3f282..abcfa08c4d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java @@ -70,4 +70,9 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei loanRepaymentPlanDetailsService.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest); return rb.success(); } + + @Override + public ResultBean pushFund(String sid) { + return loanRepaymentPlanDetailsService.pushFund(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index b1d716032c..34a7e9e3a3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -1,62 +1,39 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.google.common.util.concurrent.ThreadFactoryBuilder; +import cn.hutool.core.date.DateTime; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; + import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; -import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; +import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.DifferenceVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.HistoryOverDueVo; -import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryDto; + import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.*; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*; -import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; -import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation; + +import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService; -import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; -import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService; -import com.yxt.anrui.riskcenter.biz.loanwarrantinformation.LoanWarrantInformationService; -import com.yxt.common.base.config.component.DocPdfComponent; + import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.MsgWs; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.base.utils.WordConvertUtils; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.MessageFeign; -import com.yxt.messagecenter.api.message.MessagePushTransferDto; -import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.io.InputStream; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.*; -import java.util.stream.Collectors; /** @@ -67,11 +44,25 @@ import java.util.stream.Collectors; @Service public class LoanRepaymentPlanDetailsService extends MybatisBaseService { - + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; @Autowired private LoanRepaymentHistoryService loanRepaymentHistoryService; @Autowired private LoanRepaymentScheduleService loanRepaymentScheduleService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private FinKingDeeFeign finKingDeeFeign; + @Autowired + private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign; + @Autowired + private BasePurchaseSystemFeign basePurchaseSystemFeign; + @Autowired + private LoanPushFundHistoryService loanPushFundHistoryService; + @Transactional(rollbackFor = Exception.class) public ResultBean savePlanDetails(LoanRepaymentPlanDetailsDto dto) { @@ -194,7 +185,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selUseOrgSidListForFundVoucher() { - return baseMapper.selUseOrgSidListForFundVoucher(); + return baseMapper.selUseOrgSidListForFundVoucher(); } public List getFundForVoucher(String u) { @@ -206,10 +197,105 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService fundHistoryList = new ArrayList<>(); + LoanRepaymentPlanDetails planDetails = fetchBySid(sid); + GeneralVoucher generalVoucher = new GeneralVoucher(); + List voucherDetails = new ArrayList<>(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(planDetails.getUseOrgSid()).getData(); + if (null != organizationVo) { + generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); + } + GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail(); + voucherDetail1.setSceneCode("贷方"); + voucherDetail1.setDataTime(new DateTime()); + voucherDetail1.setAmount(v.getDuePushMoney()); + List deptVo = sysOrganizationFeign.selectChildrenListBySid(planDetails.getUseOrgSid()).getData(); + if (!deptVo.isEmpty()) { + deptVo.stream().forEach(d -> { + if (d.getName().equals("金融服务部")) { + voucherDetail1.setDeptCode(d.getOrgCode()); + } + }); + } + voucherDetails.add(voucherDetail1); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(v.getBusVinSid()).getData(); + if (null != busSalesOrderVehicle) { + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + String deptSid = salesOrder.getOrgSid(); + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + voucherDetail.setSceneCode("借方"); + voucherDetail.setDataTime(new DateTime()); + SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + if (null != organizationDeptVo) { + voucherDetail.setDeptCode(organizationDeptVo.getOrgCode()); + } + if (null != salesOrder) { + if (null != busSalesOrderVehicle) { + String customerNumber = ""; + //判断财务系统是否有客户 + Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData(); + String linkNo = ""; + BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData(); + if (!aBoolean) { + // List bdCustomers = new ArrayList<>(); + BdCustomer bdCustomer = new BdCustomer(); + bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); + bdCustomer.setFShortName(salesOrder.getContractNo()); + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); + bdCustomer.setTOrgIds(data.getOrgCode()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + String vinNo = busSalesOrderVehicle.getLinkNo(); + if (vinNo.length() > 8) { + linkNo = vinNo.substring(vinNo.length() - 8); + } else { + linkNo = busSalesOrderVehicle.getLinkNo(); + } + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo); + } + } else { + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo()); + } + } + // bdCustomers.add(bdCustomer); + ResultBean resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer); + if (resultBean.getSuccess()) { + customerNumber = bdCustomer.getFNumber(); + } + } else { + customerNumber = busSalesOrderVehicle.getTemporaryNo(); + } + voucherDetail.setCustomerCode(customerNumber); + } + } + voucherDetail.setAmount(v.getDuePushMoney()); + voucherDetails.add(voucherDetail); + } + LoanPushFundHistory loanPushFundHistory = new LoanPushFundHistory(); + BeanUtil.copyProperties(v, loanPushFundHistory, "id", "sid", "fund"); + if (null != v.getDuePushMoney()) { + loanPushFundHistory.setFund(v.getDuePushMoney()); + } + fundHistoryList.add(loanPushFundHistory); + generalVoucher.setVoucherDetails(voucherDetails); + finKingDeeFeign.saveFundVoucher(generalVoucher); + // 生成推送资金占用费历史记录 + if (!fundHistoryList.isEmpty()) { + loanPushFundHistoryService.saveLists(fundHistoryList); + } + } + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java index 697ea7467a..631cd34264 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java @@ -57,6 +57,8 @@ public class AsServiceItemVo implements Vo { private String sitemCode; @ApiModelProperty("工种（分类）") private String serviceType; + @ApiModelProperty("工种sid（分类）") + private String serviceTypeSid; @ApiModelProperty("车型") private String goodsModel; @ApiModelProperty("备注") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/GoodsListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/GoodsListVo.java new file mode 100644 index 0000000000..eefa6e40f0 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/GoodsListVo.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/13 10:55 + */ +@Data +public class GoodsListVo { + + @ApiModelProperty("商品sid") + private String goodsSid; // 商品sid + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("商品编码（图号）") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("车型sid") + private String goodsModelSid; // 车型sid + @ApiModelProperty("车型") + private String goodsModel; // 车型 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("销售价") + private String price; // 销售价 + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("三包价") + private String freePrice; // 三包价 + @ApiModelProperty("商品分类") + private String goodsTypeName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java index ca66c94e01..5510d4e516 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.as.api.asservicepackage; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,5 +12,17 @@ import lombok.Data; @Data public class PackageGoodsQuery implements Query { private String orgPath; - private String goodsName; + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("零件号") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("库存") + private String kuCun; + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("商品分类") + private String goodsTypeName; + private String name; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java index d3276310de..4db7450a10 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java @@ -30,8 +30,8 @@ public class PackageItemVo { private String price; @ApiModelProperty("科目sid") private String subjectSid; - @ApiModelProperty("科目名称") - private String subjectName; + @ApiModelProperty("科目") + private String subject; // 科目 @ApiModelProperty("折扣（0-10，0免费，10不打折）") private String discount; // 折扣（0-10，0免费，10不打折） @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/SubjectVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/SubjectVo.java new file mode 100644 index 0000000000..0a4014a8a4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/SubjectVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/13 14:31 + */ +@Data +public class SubjectVo { + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目") + private String subject; // 科目 +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java index 35a474a6de..f95c4c72d8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java @@ -29,13 +29,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.as.api.asservicepackage.PackageAttachItemVo; -import com.yxt.anrui.as.api.asservicepackage.PackageItemVo; +import com.yxt.anrui.as.api.asservicepackage.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackage; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo; import java.util.List; @@ -68,4 +65,6 @@ public interface AsServicePackageMapper extends BaseMapper { List selItemInfo(@Param("useOrgSid") String useOrgSid); List selAttItemInfo(@Param("useOrgSid") String useOrgSid); + + List selSubjectInfo(@Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml index fd0a5d0c29..2ec3e239cd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml @@ -31,4 +31,13 @@ FROM as_service_attachitem WHERE createOrgSid = #{useOrgSid} + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java index 6a98e364ac..604f3b6228 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java @@ -107,11 +107,18 @@ public class AsServicePackageRest { List voList = asServicePackageService.selAttItemInfo(orgPath); return rb.success().setData(voList); } + @ApiOperation("查询分公司科目") + @GetMapping("/selSubjectInfo") + public ResultBean> selSubjectInfo(@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List voList = asServicePackageService.selSubjectInfo(orgPath); + return rb.success().setData(voList); + } @ApiOperation("查询分公司商品信息") @PostMapping("/selGoodsInfo") - public ResultBean> selGoodsInfo(@RequestBody PagerQuery pq){ + public ResultBean> selGoodsInfo(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pagerVo = asServicePackageService.selGoodsInfo(pq); + PagerVo pagerVo = asServicePackageService.selGoodsInfo(pq); return rb.success().setData(pagerVo); } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java index 0b34b55f15..fc426b7986 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java @@ -193,8 +193,8 @@ public class AsServicePackageService extends MybatisBaseService selGoodsInfo(PagerQuery pq) { + public PagerVo selGoodsInfo(PagerQuery pq) { PagerQuery query = new PagerQuery<>(); BeanUtil.copyProperties(pq, query); - AsServicePackageQuery params = pq.getParams(); - ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()); - if (orgSidByPath.getSuccess()) { - String useOrgSid = orgSidByPath.getData(); - WmsGoodsPackageQuery queryParams = query.getParams(); - queryParams.setUseOrgSid(useOrgSid); - } + PackageGoodsQuery params = pq.getParams(); +// ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()); +// if (orgSidByPath.getSuccess()) { +// String useOrgSid = orgSidByPath.getData(); +// WmsGoodsPackageQuery queryParams = query.getParams(); +// queryParams.setUseOrgSid(useOrgSid); +// } ResultBean> voResultBean = wmsGoodsFeign.getPackageGoodsVo(query); - PagerVo vo = new PagerVo<>(); + PagerVo vo = new PagerVo<>(); if (voResultBean.getSuccess()) { PagerVo data = voResultBean.getData(); BeanUtil.copyProperties(data, vo); } return vo; } + + public List selSubjectInfo(String orgPath) { + List list = new ArrayList<>(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + list = baseMapper.selSubjectInfo(useOrgSid); + } + return list; + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java index c2c09c86dd..dbf97c55fd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java @@ -1,6 +1,7 @@ package com.yxt.anrui.as.feign.wms.wmsgoods; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,5 +12,17 @@ import lombok.Data; @Data public class WmsGoodsPackageQuery implements Query { private String useOrgSid; - private String goodsName; + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("零件号") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("库存") + private String kuCun; + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("商品分类") + private String goodsTypeName; + private String name; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java index 4f8c00fe3c..9813f3bc60 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java @@ -25,24 +25,22 @@ public class WmsGoodsPackageVo { private String goodsModel; // 车型 @ApiModelProperty("单位") private String unit; // 单位 -// @ApiModelProperty("仓库sid") -// private String warehouseSid; // 仓库sid -// @ApiModelProperty("仓库名称") -// private String warehouse; // 仓库名称 -// @ApiModelProperty("科目sid") -// private String subjectSid; // 科目sid -// @ApiModelProperty("科目") -// private String subject; // 科目 -// @ApiModelProperty("销售价") -// private String price; // 销售价 -// @ApiModelProperty("数量") -// private String count; // 数量 -// @ApiModelProperty("折扣（0-10，0免费，10不打折）") -// private String discount; // 折扣（0-10，0免费，10不打折） -// @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") -// private String discountAmount; // 优惠金额（=销售价*(折扣*0.1）） -// @ApiModelProperty("金额（销售价-优惠金额）") -// private String amount; // 金额（销售价-优惠金额） @ApiModelProperty("规格") private String specification; // 规格 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("销售价") + private String price; // 销售价 + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("三包价") + private String freePrice; // 三包价 + @ApiModelProperty("商品分类") + private String goodsTypeName; }