问题修改

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;
 }

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("发车日期")

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<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pq);
+        public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pq);
 
     /**
      * 按照组织层级分页查询

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;
+
 
     /***************车型查询**********************/
 

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;
 }

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;
 }

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(厂商认款) <br/>
@@ -227,8 +224,10 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
             return rb.setMsg("该数据已认款,请勿重复操作");
         }
         String witMatUrl = baseManufactorSubscription.getWitMatUrl();
-        if (StringUtils.isBlank(witMatUrl)) {
-            return rb.setMsg("请优先上传见证材料");
+        if (!"2".equals(baseManufactorSubscription.getPaymentState())){
+            if (StringUtils.isBlank(witMatUrl)) {
+                return rb.setMsg("请优先上传见证材料");
+            }
         }
         Map<String, Object> map = BeanUtil.beanToMap(dto);
         //根据用户sid查询名称
@@ -276,6 +275,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                     //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
                     String billNo = getApplyCode(dto.getUserSid());
                     scmApplyInbound.setApplicationCode(billNo);
+                    scmApplyInbound.setOrgPriceDate(DateUtil.formatDate(new Date()));
                     scmApplyInbound.setModelSid(vo.getVehicleSid());
                     scmApplyInbound.setModelName(vo.getVehicleName());
                     scmApplyInbound.setApplicationDate(DateUtil.today());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -500,7 +500,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             /**
              *  // 入库日期:FDate  (必填项)
              */
-            stkInStock.setFDate(baseVehicle.getPriceDate());
+            stkInStock.setFDate(baseVehicle.getOrgPriceDate());
 
             /**
              * // 物料列表:FInStockEntry  (必填项)

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -331,6 +331,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
                 qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
             }
+            String salesStartDate = pagerQuery.getSalesStartDate();
+            String salesEndDate = pagerQuery.getSalesEndDate();
+            qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= 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<BaseVehicleMapper, Ba
         list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
 
 
-
         configDetailVo.setConfigInfo(list2);
         //更多配置
         String otherConfig = configVo.getOtherConfig();
@@ -1549,9 +1558,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 qw.eq("bv.useOrgSid", orgSid);
             }*/
             //分公司
-            if(org.apache.commons.lang3.StringUtils.isNotBlank(params.getOrgPath())){
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                qw.eq("createOrgSid",orgSid);
+                qw.eq("createOrgSid", orgSid);
             }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {
@@ -3196,24 +3205,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }*/
             //根据销售订单sid查询销售订单的分公司sid、车型sid、配置sid、非删除、库存状态为库存、锁定状态为未锁定
             ResultBean<AppOrderDetailsVo> 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<InputVinListVo> pagging = baseMapper.saleOrderVin(page, qw, params.getNames());
         PagerVo<InputVinListVo> p = PagerUtil.pageToVo(pagging, null);

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
         <where>
             ${ew.sqlSegment}
         </where>

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`

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<BusVehicleApplyMa
     private MessageListFeign messageListFeign;
     @Autowired
     private SysProUrlFeign sysProUrlFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
 
     /**
      * 分页列表
@@ -163,6 +167,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         qw.orderByDesc("bva.id");
         IPage<BusVehicleApply> page = PagerUtil.queryToPage(pq);
         IPage<BusVehicleApplyVo> 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<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

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<BusVehicleOrderMa
                 scmApplyInbound.setApplicationCode(billNo);
                 String purchaseApplyMediumModelSid = dto.getPurchaseApplyMediumModelSid();
                 BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(purchaseApplyMediumModelSid);
+                scmApplyInbound.setOrgPriceDate(DateUtil.formatDate(new Date()));
                 scmApplyInbound.setModelSid(busVehicleApplyDetail.getVehicleSid());
                 scmApplyInbound.setModelName(busVehicleApplyDetail.getVehicleName());
                 scmApplyInbound.setApplicationDate(DateUtil.today());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java

@@ -34,7 +34,9 @@ public class StkTransferDirectService extends FinKingDeeService {
             Map<String,String> map_fEntityModel_= object2Map(stkTransferDirect);
             List<StkTransferDirect.FBillEntry> 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){

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;

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) <br/>
@@ -76,4 +78,6 @@ public class ScmVehicleInventoryVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
+    @ApiModelProperty("见证材料")
+    private List<String> images = new ArrayList<>();
 }

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<ScmApplyInboundMa
         for (ScmApplyInboundVehicleDto s : scmApplyInboundVehicleDtos) {
             //车辆台账推送数据
             BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
+            //公司入库日期
+            baseVehicleDto.setOrgPriceDate(booad.getOrgPriceDate());
             //车辆型号
             baseVehicleDto.setVehMark(vehicleNo);
             //采购系统（部门）sid

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -238,16 +238,16 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
 
     public ResultBean ctcgykd(String cgrkdSid) {
         ResultBean rb = ResultBean.fireFail();
+        ScmApplyInboundQuery scmApplyInboundQuery = fetchBySid(cgrkdSid);
         List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
-        List<BaseVehicleSelectVo> baseVehicles = new ArrayList<>();
+        List<BaseVehicle> 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<ScmApplyInbo
             List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
             //直接调拨单的物料列表
             List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
-            for (BaseVehicleSelectVo baseVehicleDto : baseVehicles) {
+            for (BaseVehicle baseVehicleDto : baseVehicles) {
                 StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
                 sf.setWlfz(baseVehicleDto.getCarBrandCode());
                 //单价   对应厂家结算价