问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -181,4 +181,6 @@ public class BaseVehicle extends BaseEntity {
     private String orgCode;
     @ApiModelProperty(value = "车辆型号")
     private String vehMark;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@@ -154,4 +154,6 @@ public class BaseVehicleSelectVo implements Vo {
     private String supplierCode;
     @ApiModelProperty(value = "分公司code")
     private String orgCode;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@@ -250,4 +250,6 @@ public class BaseVehicleVo implements Vo {
     private String trailerOrInstallDealPrice;
     @ApiModelProperty("总成交价")
     private String totalDealPrice;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -520,18 +520,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             }
                         }
                         // 供应商:FSupplierId  (必填项)
-                        String vinNo = baseInternalPurchaseVehicles2.get(0).getVinNo();
-                        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
-                        if (baseVehicle != null) {
-                            String supplierSid = baseVehicle.getSupplierSid();
-                            BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(supplierSid);
-                            stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
-                        }
+                        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()).getData();
+                        stkInStock.setFSupplierId(sysOrganizationVo.getOtherCode());
                         //stkInStock.setFSupplierId("010001");
                         // 物料列表:FInStockEntry  (必填项)
                         List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
                         for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
                             StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+                            String vinNo = baseInternalPurchaseVehicle.getVinNo();
                             //单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
                             sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
                             //车辆类型

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

@@ -1560,7 +1560,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //分公司
             if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                qw.eq("createOrgSid", orgSid);
+                qw.eq("bv.createOrgSid", orgSid);
             }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -211,6 +211,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             ScmApplyInbound inboundVehicle = new ScmApplyInbound();
             BeanUtil.copyProperties(dto, inboundVehicle);
+            String billNo = getApplyCode(dto.getUserSid());
+            inboundVehicle.setApplicationCode(billNo);
             inboundVehicle.setSid(UUID.randomUUID().toString());
             inboundVehicle.setOrgSidPath(orgPath);
             save(inboundVehicle);

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

@@ -168,6 +168,15 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
         ScmApplyInboundQuery entity = fetchBySid(sid);
         ScmApplyInboundQueryDetailsVo vo = new ScmApplyInboundQueryDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(sid);
+        vo.setScmApplyInboundVehQueryList(scmApplyInboundVehQueryDetailsVos);
+        BigDecimal totalMoney = new BigDecimal(0);
+        for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) {
+            String settleMoney = scmApplyInboundVehQueryDetailsVo.getSettleMoney();
+            totalMoney = totalMoney.add(new BigDecimal(settleMoney));
+        }
+        String transform = TransformMoney.transform(totalMoney.toString());
+        vo.setTotalMoney(transform);
         return vo;
     }
 
@@ -260,7 +269,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
             stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode());
             stkInStock.setFSupplierId(baseVehicle.getSupplierCode());
             // 入库日期:FDate  (必填项)
-            stkInStock.setFDate(DateUtil.formatDate(baseVehicle.getPriceDate()));
+            stkInStock.setFDate(baseVehicle.getOrgPriceDate());
             // 物料列表:FInStockEntry  (必填项)
             List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
             //直接调拨单的物料列表