From f7e099f60cca4e90eefe2f81b49e6706b27b722f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 5 Jul 2022 14:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=85=A5=E8=B4=A6=E7=94=B3=E8=AF=B7=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusVehicleOrderService.java               | 40 +++++++++++--------
 .../api/scmapplyinbound/ScmApplyInbound.java  |  3 +-
 .../scmapplyinbound/ScmApplyInboundDto.java   |  6 +++
 3 files changed, 31 insertions(+), 18 deletions(-)

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 5dca4bda6c..4ec2352a44 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
@@ -221,23 +221,29 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
             BusVehicleOrder vehicleOrder = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, vehicleOrder);
             updateById(vehicleOrder);
-            ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
-            //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
-            //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
-            String billNo = getApplyCode(dto.getUserSid());
-            scmApplyInbound.setApplicationCode(billNo);
-            String purchaseApplyMediumModelSid = dto.getPurchaseApplyMediumModelSid();
-            BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(purchaseApplyMediumModelSid);
-            scmApplyInbound.setModelSid(busVehicleApplyDetail.getVehicleSid());
-            scmApplyInbound.setModelName(busVehicleApplyDetail.getVehicleName());
-            scmApplyInbound.setApplicationDate(DateUtil.today());
-            scmApplyInbound.setVehicleOrderSid(dto.getSid());
-            scmApplyInbound.setPurchaseOrderNo(dto.getOrderNo());
-            scmApplyInbound.setApplicationSid(dto.getUserSid());
-            scmApplyInbound.setUserSid(dto.getUserSid());
-            scmApplyInbound.setApplicationName(dto.getUserName());
-            scmApplyInbound.setConfigName(busVehicleApplyDetail.getConfigName());
-            scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
+            String offlineDate = dto.getOfflineDate();
+            if (StringUtils.isNotBlank(offlineDate)){
+                ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
+                //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
+                //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
+                String billNo = getApplyCode(dto.getUserSid());
+                scmApplyInbound.setApplicationCode(billNo);
+                String purchaseApplyMediumModelSid = dto.getPurchaseApplyMediumModelSid();
+                BusVehicleApplyDetail busVehicleApplyDetail = busVehicleApplyDetailService.fetchBySid(purchaseApplyMediumModelSid);
+                scmApplyInbound.setModelSid(busVehicleApplyDetail.getVehicleSid());
+                scmApplyInbound.setModelName(busVehicleApplyDetail.getVehicleName());
+                scmApplyInbound.setApplicationDate(DateUtil.today());
+                scmApplyInbound.setVehicleOrderSid(dto.getSid());
+                scmApplyInbound.setPurchaseOrderNo(dto.getOrderNo());
+                scmApplyInbound.setApplicationSid(dto.getUserSid());
+                scmApplyInbound.setUserSid(dto.getUserSid());
+                scmApplyInbound.setApplicationName(dto.getUserName());
+                scmApplyInbound.setConfigName(busVehicleApplyDetail.getConfigName());
+                scmApplyInbound.setConfigSid(busVehicleApplyDetail.getConfigSid());
+                scmApplyInbound.setNodeState("待提交");
+                scmApplyInbound.setNum(dto.getPlatformNo());
+                scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
+            }
             return rb.success();
         }
     }
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 16660db4c0..a2e70f187c 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
@@ -73,5 +73,6 @@ public class ScmApplyInbound extends BaseEntity {
 
     @ApiModelProperty("任务id")
     private String taskId;
-
+    @ApiModelProperty("车辆台数")
+    private String num;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
index 2e03bcfe36..f0f8bcae4c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
@@ -80,6 +80,12 @@ public class ScmApplyInboundDto implements Dto {
     @ApiModelProperty("备注")
     private String remarks;
 
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    @ApiModelProperty("车辆台数")
+    private String num;
+
     @ApiModelProperty("车辆列表")
     private List<ScmApplyInboundVehicleDto> vehicleList;
 }
\ No newline at end of file