diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java index a60b3f3994..841c79753b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java @@ -79,4 +79,6 @@ public class BaseOutsourcingApplicationVo implements Vo { private String procInstSid; @ApiModelProperty("任务id") private String taskId; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 0a4a613538..dfafaa1d32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -54,6 +54,8 @@ public class BaseVehicleDto implements Dto { private String manPurOrderTypeKey; @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; + @ApiModelProperty("公司入库日期") + private String orgPriceDate; @ApiModelProperty(value = "厂家入库日期") private String priceDate; @ApiModelProperty("发车日期") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index c1b7d2f589..20ad6f7769 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -48,7 +48,7 @@ public interface BaseVehicleFeign { */ @ApiOperation("车辆信息分页列表") @PostMapping("/pagerList") - public ResultBean> pagerList(@RequestBody PagerQuery pq); + public ResultBean> pagerList(@RequestBody PagerQuery pq); /** * 按照组织层级分页查询 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java index a90ced2f1c..e2ab9cf6ee 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java @@ -50,6 +50,16 @@ public class BaseVehicleQuery implements Query { @ApiModelProperty(value = "买断状态") private String settlementStatus; + @ApiModelProperty(value = "销售开始日期") + private String salesStartDate; + @ApiModelProperty(value = "销售结束日期") + private String salesEndDate; + + @ApiModelProperty(value = "买断开始日期") + private String solidStartDate; + @ApiModelProperty(value = "买断结束日期") + private String solidEndDate; + /***************车型查询**********************/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index 5300338972..c3591530a5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -107,4 +107,6 @@ public class BaseVehicleOutVo implements Vo { private String trailerOrInstallDealPrice; @ApiModelProperty("上装/挂车物料编码") private String trailerOrInstallCode; + @ApiModelProperty("内部引荐人姓名") + private String innerName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java index a0a6b1cc30..e8dc6a268c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java @@ -52,4 +52,8 @@ public class BusVehicleApplyVo implements Vo { @ApiModelProperty("采购类型value") private String applyType; + @ApiModelProperty("采购部门sid") + private String orgDeptSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index b7f10cacc5..dd0991b69f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -58,10 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Project: manufactor_subscription(厂商认款)
@@ -227,8 +224,10 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService map = BeanUtil.beanToMap(dto); //根据用户sid查询名称 @@ -276,6 +275,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService= date_format('" + salesStartDate + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" + ); + String solidStartDate = pagerQuery.getSolidStartDate(); + String solidEndDate = pagerQuery.getSolidEndDate(); + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" + ); //车型字段 if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌 qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); @@ -890,7 +900,6 @@ public class BaseVehicleService extends MybatisBaseService orderDetailsVoResultBean = busSalesOrderFeign.getSaleOrderDetails(params.getSaleOrderSid()); - if(orderDetailsVoResultBean.getData() != null){ + if (orderDetailsVoResultBean.getData() != null) { AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData(); //分公司sid String useOrgSid = appOrderDetailsVo.getUseOrgSid(); - qw.eq("bv.createOrgSid",useOrgSid); + qw.eq("bv.createOrgSid", useOrgSid); //车型sid String modelSid = appOrderDetailsVo.getModelInfo().getModelSid(); //配置sid String configSid = appOrderDetailsVo.getModelInfo().getConfigSid(); - qw.eq("bv.modelSid",modelSid); - qw.eq("bv.modelConfigSid",configSid); + qw.eq("bv.modelSid", modelSid); + qw.eq("bv.modelConfigSid", configSid); } //非删除 - qw.eq("bv.isDelete",0); + qw.eq("bv.isDelete", 0); //库存状态为库存 - qw.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode()); + qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); //锁定状态为未锁定 - qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode()); + qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); } IPage pagging = baseMapper.saleOrderVin(page, qw, params.getNames()); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index b3cd710a9e..8fd61a71c3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -51,12 +51,14 @@ bv.modelSid, bv.modelConfigSid, bvc.sid as vehModelConfigSid, - bvc.guidedPrice + bvc.guidedPrice, + bvoa.innerName from base_vehicle_out bvo left join base_vehicle bv on bv.sid = bvo.vinSid left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid = bvc.configurationItemsSid and bv.createOrgSid = bvc.useOrgSid LEFT JOIN anrui_portal.sys_organization so ON bvo.createOrgSid = so.sid + LEFT JOIN base_vehicle_out_apply bvoa ON bvo.mainSid = bvoa.sid ${ew.sqlSegment} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 330ad4c999..3d6fad1bda 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -17,7 +17,8 @@ bva.procInstId, bva.applyType, bva.applyTypeKey, - bva.id + bva.id, + bva.orgDeptSid FROM bus_vehicle_apply bva LEFT JOIN bus_vehicle_apply_detail bvad ON bva.sid = bvad.`applySid` diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index f05d46b9e9..40b8f38c1e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.busvehicleapply.*; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo; @@ -25,6 +26,7 @@ import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; +import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; @@ -123,6 +125,8 @@ public class BusVehicleApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (BusVehicleApplyVo record : pagging.getRecords()) { + String orgDeptSid = record.getOrgDeptSid(); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(orgDeptSid).getData(); + record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 38764fa864..60f8a17381 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -61,6 +61,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; @@ -252,6 +253,7 @@ public class BusVehicleOrderService extends MybatisBaseService map_fEntityModel_= object2Map(stkTransferDirect); List fBillEntry = stkTransferDirect.getFBillEntry(); for (StkTransferDirect.FBillEntry f: fBillEntry){ - f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每个分公司都有这个编码的仓库。 + if (!f.getFDestStockId().equals("ARZTCK")){ + f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每个分公司都有这个编码的仓库。 + } //单据查看的json模板 JSONObject result2 = getMaterial(f); if(result2==null){ diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java index 833d800d6b..b3370cf21c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java @@ -106,7 +106,7 @@ public class ScmApplyInbound extends BaseEntity { @ApiModelProperty("厂家入库日期") private String priceDate; - @ApiModelProperty("'流程定义的id'") + @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例id") private String procInsId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java index 80c3da0aca..d04f71629f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java @@ -34,7 +34,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * Project: anrui_scm(anrui_scm)
@@ -76,4 +78,6 @@ public class ScmVehicleInventoryVo implements Vo { private String remarks; // 备注 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 + @ApiModelProperty("见证材料") + private List images = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index c13f889d5a..cbb415cf29 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -599,6 +599,8 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); - List baseVehicles = new ArrayList<>(); + List baseVehicles = new ArrayList<>(); for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { - String vehSid = scmApplyInboundVehQueryDetailsVo.getVehSid(); - BaseVehicleSelectVo data = baseVehicleFeign.details(vehSid).getData(); - baseVehicles.add(data); + BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(scmApplyInboundVehQueryDetailsVo.getVinNo(), scmApplyInboundQuery.getCreateOrgSid()).getData(); + baseVehicles.add(baseVehicle); } try { StkInStock stkInStock = new StkInStock(); - BaseVehicleSelectVo baseVehicle = baseVehicles.get(0); + BaseVehicle baseVehicle = baseVehicles.get(0); BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); //获取采购系统中的财务编码 if (basePurchaseSystemDetailsVo != null) { @@ -265,7 +265,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService fInStockEntry = new ArrayList<>(); //直接调拨单的物料列表 List FPAYBILLENTRYs = new ArrayList<>(); - for (BaseVehicleSelectVo baseVehicleDto : baseVehicles) { + for (BaseVehicle baseVehicleDto : baseVehicles) { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); sf.setWlfz(baseVehicleDto.getCarBrandCode()); //单价 对应厂家结算价