From 5816866044cc45e916f7ce8ff50b701f94429d2c Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 1 Mar 2023 11:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/basevehicleout/BaseVehicleOutMapper.xml |  2 +-
 .../biz/basevehicleout/BaseVehicleOutService.java    |  5 ++++-
 .../biz/busvehicleorder/BusVehicleOrderService.java  |  2 +-
 .../api/scmapplyinbound/ScmApplyInboundQuery.java    |  2 +-
 .../biz/scmapplyinbound/ScmApplyInboundService.java  | 12 +++++++-----
 5 files changed, 14 insertions(+), 9 deletions(-)

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 e9e4d65eca..24d3664f75 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
@@ -128,7 +128,7 @@
     <select id="selByExcel" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVoExecl">
         SELECT
         so.name AS createOrgName,
-        bvo.vinNo,
+        RIGHT(bvo.vinNo,8) AS vinNo,
         bv.modelName AS modelConfig,
         bv.insideCode,
         bvo.type,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index deba24ee00..eef6b07ac3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1002,7 +1002,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicleOutMaterialZC.setFlje(rebateMoney.toString());
             tRebateMoney = tRebateMoney.add(rebateMoney);
             baseVehicleOutMaterialZC.setZstc(baseVehicleOut.getGiftsDescription());
-            tGiftsDescription = tGiftsDescription.add(new BigDecimal(baseVehicleOut.getGiftsDescription()));
+            String giftsDescription = baseVehicleOut.getGiftsDescription();
+            if (StringUtils.isNotBlank(giftsDescription)){
+                tGiftsDescription = tGiftsDescription.add(new BigDecimal(giftsDescription));
+            }
             baseVehicleOutMaterialZC.setXszr(baseVehicleOut.getSalesAllowance().toString());
             tSalesAllowance = tSalesAllowance.add(baseVehicleOut.getSalesAllowance());
             baseVehicleOutMaterialZC.setRemarks(baseVehicleOut.getRemarks());
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 2fb6aeff6b..dfa4141271 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
@@ -135,7 +135,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
             qw.lt("bva.applicationDate", query.getEndDate());
         }
         if (StringUtils.isNotBlank(query.getApplicationCode())) {
-            qw.lt("bva.applicationCode", query.getApplicationCode());
+            qw.like("bva.applicationCode", query.getApplicationCode());
         }
         qw.orderByDesc("bvo.subscriptionDate");
         return qw;
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
index 4f9155a2fd..325de7b3e8 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
@@ -29,7 +29,7 @@ public class ScmApplyInboundQuery implements Query {
     @ApiModelProperty("车型")
     private String modelName;
     @ApiModelProperty("排产申请编号")
-    private String applicationCode;
+    private String pcApplicationCode;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 }
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 f2f30d3ccb..97b54c1a32 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
@@ -166,8 +166,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("sai.modelName", query.getModelName());
         }
-        if (StringUtils.isNotBlank(query.getApplicationCode())) {
-            qw.like("bva.applicationCode", query.getApplicationCode());
+        if (StringUtils.isNotBlank(query.getPcApplicationCode())) {
+            qw.like("sai.pcApplicationCode", query.getPcApplicationCode());
         }
         qw.eq("sai.useOrgSid", query.getCreateOrgSid());
         return qw;
@@ -429,10 +429,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             updateFlowFiled(BeanUtil.beanToMap(uff));
             return resultBean1;
         }
-        return submitBusinessData(dto, busSid, scmApplyInbound1.getOrgSidPath());
+        return submitBusinessData(dto, busSid, scmApplyInbound1);
     }
 
-    private synchronized ResultBean submitBusinessData(SubmitScmApplyInboundDto dto, String businessSid, String orgSidPath) {
+    private synchronized ResultBean submitBusinessData(SubmitScmApplyInboundDto dto, String businessSid, ScmApplyInbound scmApplyInbound) {
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
         List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos2 = new ArrayList<>();
@@ -452,6 +452,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (scmApplyInboundVehicleDtos1.size() > 0) {
             scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
             scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
+            scmApplyInboundDto.setPcApplicationCode(scmApplyInbound.getPcApplicationCode());
             saveOrUpdateApplyInBound(scmApplyInboundDto);
         }
         baseMapper.updateNumBySid(String.valueOf(scmApplyInboundVehicleDtos2.size()), businessSid);
@@ -459,7 +460,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         String businessTaskid = entity.getTaskId();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(scmApplyInbound.getOrgSidPath());
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getUserSid());
         //variables.put("businessSid", businessSid);
@@ -682,6 +683,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             baseVehicleDtos.add(baseVehicleDto);
         }
         ThreadUtil.execute(() -> baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode()));
+        //baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode());
     }
 
     private void saveItem(ResultBean<List<String>> resultBean1) {