优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusApplyDetailsPushDto.java

@@ -32,5 +32,8 @@ public class BusApplyDetailsPushDto implements Dto {
 
     private BusVehicleApplySzPushDto busVehicleApplySzPushDto;
 
+    @ApiModelProperty("销售指导价")
+    private String saleGuPrice;
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -9,6 +9,7 @@ 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.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleapply.*;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo;
@@ -1043,6 +1044,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public ResultBean pushApply(BusApplyPushDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleApply busVehicleApply = new BusVehicleApply();
+        BeanUtil.copyProperties(dto,busVehicleApply,"sid");
         String billNo = getApplyCode(dto.getOrgSidPath());
         busVehicleApply.setApplicationCode(billNo);
         String manufacturerSid = baseVehicleBrandService.selectByManufacturerSid(dto.getCarBrandSid());
@@ -1053,6 +1055,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             BusVehicleApplyDetail busVehicleApplyDetail = new BusVehicleApplyDetail();
             BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
             busVehicleApplyDetail.setApplySid(busVehicleApply.getSid());
+            //内部编码
+            BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleApplyDetail.getVehicleSid());
+            busVehicleApplyDetail.setInsideCode(baseVehicleModel.getInsideCode());
             busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             if (busVehicleApplyDetailDto.getBusVehicleApplySzPushDto() != null) {
                 BusVehicleApplySz busVehicleApplySz = new BusVehicleApplySz();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5268,6 +5268,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     scmPurchaseChannelPush.setConfigSid(busSalesOrderModel.getModelConfigSid());
                     scmPurchaseChannelPush.setConfigName(busSalesOrderModel.getModelConfig());
                     scmPurchaseChannelPush.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                    scmPurchaseChannelPush.setUseOrgName(busSalesOrder.getUseOrgName());
                     scmPurchaseChannelPush.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
                     BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
                     scmPurchaseChannelPush.setNum(busSalesOrderPrice.getQuantity().toString());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@@ -157,6 +157,7 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
                 return rb.setMsg("该待选择的采购渠道不存在");
             }
             BeanUtil.copyProperties(scmPurchaseChannelDto, scmPurchaseChannel, "sid");
+            scmPurchaseChannel.setCreateBySid(scmPurchaseChannel.getApplyPeoSid());
             scmPurchaseChannel.setOperateSid(scmPurchaseChannelDto.getUserSid());
             scmPurchaseChannel.setState(2);
             ResultBean<SysUserVo> resultBean = sysUserFeign.fetchBySid(scmPurchaseChannel.getOperateSid());
@@ -206,7 +207,7 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
             BusSalesOrderPrice busSalesOrderPrice = busSalesOrdersVo.getBusSalesOrderPrice();
             busApplyPushDto.setCreateBySid(scmPurchaseChannel.getOperateSid());
             busApplyPushDto.setApplicationDate(scmPurchaseChannel.getChoiceDate());
-            busApplyPushDto.setCreateByName(scmPurchaseChannel.getConfigName());
+            busApplyPushDto.setCreateByName(scmPurchaseChannel.getOperateName());
             busApplyPushDto.setSchedulingType("客户订单");
             busApplyPushDto.setSchedulingTypeKey("04");
             busApplyPushDto.setSalesSid(scmPurchaseChannel.getSaleOrderSid());
@@ -226,6 +227,7 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
             busApplyDetailsPushDto.setQuantity(busSalesOrderPrice.getQuantity().toString());
             busApplyDetailsPushDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
             busApplyDetailsPushDto.setConfigName(busSalesOrderModel.getConfig());
+            busApplyDetailsPushDto.setSaleGuPrice(busSalesOrderModel.getFinalPrice().toString());
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrdersVo.getBusSalesOrderMakeup();
             if(busSalesOrderMakeup != null){
                 BusVehicleApplySzPushDto busVehicleApplySzPushDto = new BusVehicleApplySzPushDto();
@@ -233,6 +235,7 @@ public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseCha
                 busApplyDetailsPushDto.setBusVehicleApplySzPushDto(busVehicleApplySzPushDto);
             }
             busApplyDetailsPushDtos.add(busApplyDetailsPushDto);
+            busApplyPushDto.setBusVehicleApplyDetailList(busApplyDetailsPushDtos);
             busVehicleApplyFeign.pushApply(busApplyPushDto);
         }
     }