问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java

@@ -119,4 +119,7 @@ public class BusVehicleOrder extends BaseEntity {
 
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
+
+    @ApiModelProperty(value = "认款日期")
+    private String subscriptionDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java

@@ -133,6 +133,9 @@ public class BusVehicleOrderDto implements Dto {
 	@ApiModelProperty("订单状态")
     private String orderStatus; // 订单状态
 
+	@ApiModelProperty(value = "认款日期")
+	private String subscriptionDate;
+
 	@ApiModelProperty("备注")
 	private String remarks; // 备注
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListDto.java

@@ -32,6 +32,9 @@ public class BusVehicleOrderListDto implements Dto {
     private String orderTypeKey;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
+
+    @ApiModelProperty(value = "认款日期")
+    private String subscriptionDate;
     @ApiModelProperty(value = "订单状态")
     private String orderStatus;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java

@@ -106,6 +106,9 @@ public class BusVehicleOrderVo implements Vo {
 	@ApiModelProperty("订单状态")
     private String orderStatus;
 
+    @ApiModelProperty(value = "认款日期")
+    private String subscriptionDate;
+
     @ApiModelProperty("备注")
     private String remarks;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/VehicleOrderListVo.java

@@ -49,4 +49,6 @@ public class VehicleOrderListVo implements Vo {
     private String applicationCode;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
+    @ApiModelProperty(value = "认款日期")
+    private String subscriptionDate;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml

@@ -44,7 +44,7 @@
     </update>
 
 	<select id="selectNum" resultType="int">
-		SELECT CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED) CODE
+		SELECT IFNULL(CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED),0) CODE
 		from base_internal_purchase
 		where applyNo LIKE concat(#{bill}, '%')
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -235,6 +235,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                 listDto.setOrderTypeKey("001");
                 listDto.setInsideCode(vo.getInsideCode());
                 listDto.setOrderStatus("待办");
+                listDto.setSubscriptionDate(baseManufactorSubscription.getSubscriptionDate());
                 dtoList.add(listDto);
             }
             busVehicleOrderService.saveVehicleOrder(dtoList);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareMapper.xml

@@ -12,7 +12,7 @@
 	</select>
 
 	<select id="selectNum" resultType="int">
-		SELECT CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED) CODE
+		SELECT IFNULL(CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED),0) CODE
 		from base_manufacturer_retware
 		where applyNo LIKE concat(#{bill}, '%')
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml

@@ -36,7 +36,7 @@
     </update>
 
 	<select id="selectNum" resultType="int">
-        SELECT CAST(REPLACE(MAX(applicationCode), #{bill}, '')AS SIGNED) CODE
+        SELECT IFNULL(CAST(REPLACE(MAX(applicationCode), #{bill}, '')AS SIGNED),0) CODE
         FROM base_outsourcing_application
         WHERE applicationCode LIKE CONCAT(#{bill}, '%')
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java

@@ -111,5 +111,5 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
      */
     List<AppOrderReadyCar> getAppReadyCar(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
-    String getContractPrice();
+    String getContractPrice(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -208,5 +208,6 @@
                 ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
                      LEFT JOIN anrui_scm.`scm_apply_inbound` sai
                 ON sai.vehicleOrderSid = bvo.`sid`
+        WHERE bvad.applySid = #{sid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -138,6 +138,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         if (StringUtils.isNotBlank(query.getEndDate())) {
             qw.lt("bva.applicationDate", query.getEndDate());
         }
+        qw.orderByDesc("bvo.subscriptionDate");
         return qw;
     }
 
@@ -256,7 +257,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setConfigSid(busVehicleApplyDetail.getConfigSid());
                 scmApplyInbound.setNodeState("待提交");
                 scmApplyInbound.setNum(dto.getPlatformNo());
-                String contractPrice = baseMapper.getContractPrice();
+                String contractPrice = baseMapper.getContractPrice(dto.getPurchaseRequisitionSid());
                 scmApplyInbound.setContractPrice(new BigDecimal(contractPrice));
                 scmApplyInbound.setCostPrice(new BigDecimal(contractPrice));
                 scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);

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

@@ -32,7 +32,7 @@
     </update>
 
     <select id="selectNum" resultType="int">
-      SELECT CAST(REPLACE(MAX(applicationCode), #{bill}, '')AS SIGNED) CODE
+        SELECT IFNULL(CAST(REPLACE(MAX(applicationCode), #{bill}, '') AS SIGNED),0) CODE
         from scm_apply_inbound
         where applicationCode LIKE concat(#{bill}, '%')
     </select>

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

@@ -195,11 +195,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             } else {
                 return new ResultBean().fail().setMsg("车辆台数填写不正确");
             }
-            if (scmFiles.size() > 0) {
-                for (ScmFileDto scmFile : scmFiles) {
-                    scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType());
-                    scmFile.setLinkSid(inboundVehicle.getSid());
-                    scmFileService.saveOrUpdateDto(scmFile);
+            if (scmFiles != null) {
+                if (scmFiles.size() > 0) {
+                    for (ScmFileDto scmFile : scmFiles) {
+                        scmFile.setAttachType(CommonAttachTypeEnum.INBOUNDAPPLY.getAttachType());
+                        scmFile.setLinkSid(inboundVehicle.getSid());
+                        scmFileService.saveOrUpdateDto(scmFile);
+                    }
                 }
             }
             return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());