diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java index eb7bffa902..e0a38fa407 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java @@ -99,7 +99,7 @@ public class BaseInternalPurchaseDetailsVo implements Vo { @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 @ApiModelProperty("调入方采购部门sid") - private String callInBuyerOrgSid; // 调入方采购部门sid + private String callInBuyerOrgSid; // 调入方采购部门sid @ApiModelProperty("调入方采购部门名称") private String callInBuyerOrgName; // 调入方采购部门名称 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 3afc229b9e..bf39885077 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -31,7 +31,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yxt.anrui.base.api.basedistributor.BaseDistributor; import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign; import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo; import com.yxt.anrui.base.api.basetrailer.*; @@ -45,24 +44,17 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; -import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.common.enums.BillTypeEnum; -import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderContractNoDto; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; @@ -88,7 +80,6 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; -import com.yxt.anrui.fin.api.finfundscarriedforwardapply.FinFundsCarriedForwardApply; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService; @@ -116,10 +107,8 @@ import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFile; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign; -import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.common.base.config.component.DocPdfComponent; @@ -134,7 +123,6 @@ import com.yxt.messagecenter.api.message.*; import com.yxt.messagecenter.api.messagelist.MessageList; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -144,12 +132,10 @@ import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -import java.text.MessageFormat; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -import static java.util.Collections.singletonList; import static java.util.Comparator.comparing; /** @@ -3802,7 +3788,7 @@ public class FinBillApplicationService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + //是否为单笔欠款出厂 + variables.put("isdb", !asArrearsoutApply.getBillTypeKey().equals("2")); //流程定义id bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId()); bv.setFormVariables(variables); @@ -366,6 +366,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + //是否为单笔欠款出厂 + variables.put("isdb", !asArrearsoutApply.getBillTypeKey().equals("2")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -425,6 +427,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + //是否为单笔欠款出厂 + variables.put("isdb", !asArrearsoutApply.getBillTypeKey().equals("2")); bv.setModelId(asArrearsoutApply.getProcDefId()); bv.setFormVariables(variables); //======================================= @@ -446,6 +450,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + //是否为单笔欠款出厂 + variables.put("isdb", !asArrearsoutApply.getBillTypeKey().equals("2")); bv.setModelId(asArrearsoutApply.getProcDefId()); bv.setFormVariables(variables); //======================================= @@ -481,6 +487,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + //是否为单笔欠款出厂 + variables.put("isdb", !asArrearsoutApply.getBillTypeKey().equals("2")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index dc075bcb79..749e792dbb 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -36,10 +36,6 @@ import com.yxt.pms.biz.pms.pmspurchasebackbill.flowable.*; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService; -import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBill; -import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillService; -import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo; -import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo; import com.yxt.pms.feign.base.Rule; import com.yxt.pms.feign.flowable.flow.*; import com.yxt.pms.feign.flowable.flow2.FlowDelegateQuery; @@ -56,6 +52,8 @@ import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.pms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.pms.feign.privilege.PrivilegeQuery; import com.yxt.pms.feign.sysuser.SysUserFeign; +import com.yxt.pms.feign.wms.wmsinventoryrecord.InventoryRecordDto; +import com.yxt.pms.feign.wms.wmsinventoryrecord.WmsInventoryRecordFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -66,7 +64,6 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; import java.util.concurrent.*; @@ -106,6 +103,8 @@ public class PmsPurchasebackBillService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsPurchasebackBillQuery query = pq.getParams(); @@ -376,6 +375,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService pmsPurchasebackDetailDetailsVos = pmsPurchasebackDetailService.selByMainSid(businessSid); Map variables = new HashMap<>(); //判断发起人是否为配件主管 String createBySid = pmsPurchasebackBill.getCreateBySid(); @@ -384,14 +384,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); - FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - if (StringUtils.isBlank(pmsPurchasebackBill.getProcDefId())) { - flowProcessMapQuery.setProDefKey(bv.getModelId()); - } else { - flowProcessMapQuery.setProDefKey(pmsPurchasebackBill.getProcDefId()); - } - flowProcessMapQuery.setVariables(variables); - variables = flowableFeign.getMap(flowProcessMapQuery).getData(); //======================================= bv.setFormVariables(variables); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(pmsPurchasebackBill.getDeptSid()).getData(); @@ -404,22 +396,73 @@ public class PmsPurchasebackBillService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + PmsPurchasebackBill purchasebackBill = pmsPurchasebackBill; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + ufVo.setProcDefId(purchasebackBill.getProcDefId()); + ufVo.setProcInsId(purchasebackBill.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("采购退货单申请"); + messageFlowableQuery.setMsgContent(purchasebackBill.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("采购退货单申请"); + messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } + //==================================添加线程 } return rb.success().setData(resultBean.getData()); } else { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/InventoryRecordDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/InventoryRecordDto.java new file mode 100644 index 0000000000..aaff4d8b49 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/InventoryRecordDto.java @@ -0,0 +1,92 @@ +package com.yxt.pms.feign.wms.wmsinventoryrecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/10/30 10:19 + */ +@Data +public class InventoryRecordDto { + + private String sid; // sid + + @ApiModelProperty("库存sid") + private String inventorySid; // 库存sid + @ApiModelProperty("创建人sid") + private String createBySid; // 商品ID + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("来源单sid（业务单sid）") + private String sourceBillSid; // 来源单sid（业务单sid） + @ApiModelProperty("来源单据编号") + private String billNo; // 来源单据编号 + @ApiModelProperty("单据类型（1入库、0出库）") + private String billType; // 单据类型（1入库、0出库） + @ApiModelProperty("业务类型key（采购入库、维修出入库、销售出入库等）") + private String busTypeKey; // 业务类型key（采购入库、维修出入库、销售出入库等） + @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") + private String busTypeValue; // 业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等） + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 +// @ApiModelProperty("出入库后的库存量") +// private String currentCount; // 出入库后的库存量 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("库位编号") + private String warehouseRackCode; // 库位编号 + @ApiModelProperty("入库单价") + private String cost; + @ApiModelProperty("税率") + private String taxRate; + @ApiModelProperty("入库金额") + private String amount; + @ApiModelProperty("经办人sid") + private String handlerSid; // 库位sid + @ApiModelProperty("经办人") + private String handlerName; // 库位编号 + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + + @ApiModelProperty("销售指导价") + private String guidPrice; + @ApiModelProperty("客户/供应商sid，出库是为客户，入库时为供应商") + private String supplierSid; + @ApiModelProperty("客户/供应商名称") + private String supplierName; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("前一单据明细sid（溯源使用）") + private String preBillSid; + @ApiModelProperty("前一单编号") + private String preBillNo; + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/WmsInventoryRecordFeign.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/WmsInventoryRecordFeign.java new file mode 100644 index 0000000000..09111e1150 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsinventoryrecord/WmsInventoryRecordFeign.java @@ -0,0 +1,20 @@ +package com.yxt.pms.feign.wms.wmsinventoryrecord; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "库存出入库记录") +@FeignClient( + contextId = "yxt-wms-WmsInventoryRecord", + name = "yxt-wms", + path = "/apiadmin/inventory/wmsinventoryrecord") +public interface WmsInventoryRecordFeign { + + @ApiOperation("新增出入库记录") + @PostMapping("/saveInventoryRecord") + ResultBean saveInventoryRecord(@RequestBody InventoryRecordDto dto); +}