问题修改

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

@@ -621,7 +621,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             fInStockEntry.add(sf);
                             //构造入库查询车辆
                             ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
-                            scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo());
+                            scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
                             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
                             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
                             scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDRCL.getManufSaleAccessKey());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -219,7 +219,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         baseTrailerDetailsVo.setZcBrandName(baseVehicle.getCarBrandName());
         baseTrailerDetailsVo.setZcModelName(baseVehicle.getModelName());
         BaseVehicleCertificate baseVehicleCertificate = baseVehicleCertificateService.selectByVehicleSid(baseVehicle.getSid());
-        baseTrailerDetailsVo.setZcAnnouncementmodelName(baseVehicleCertificate.getCarModel());
+        if (baseVehicleCertificate != null){
+            baseTrailerDetailsVo.setZcAnnouncementmodelName(baseVehicleCertificate.getCarModel());
+        }
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vehSid).getData();
         for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
             String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
@@ -264,6 +266,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         BaseTrailer baseTrailer = new BaseTrailer();
         dto.fillEntity(baseTrailer);
         baseTrailer.setCreateBySid(dto.getUserSid());
+        String vehSid = dto.getVehSid();
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
         //厂商结算价
         String settlementPrice = dto.getSettlementPrice();
         if (StringUtils.isNotBlank(settlementPrice)) {
@@ -276,7 +280,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             BigDecimal decimal = new BigDecimal(dealPrice);
             baseTrailer.setDealPrice(decimal);
         }
-        String billNo = getGCRKApplyCode(dto.getUserSid());
+        String billNo = getGCRKApplyCode(baseVehicle);
         baseTrailer.setBillNo(billNo);
         boolean isSave = save(baseTrailer);
         if (!isSave) {
@@ -355,11 +359,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return rb.success().setMsg("保存成功");
     }
 
-    public String getGCRKApplyCode(String userSid) {
+    public String getGCRKApplyCode(BaseVehicle baseVehicle) {
-        //获取分公司sid
+        String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = basePurchaseSystemDetailsVo.getOrgCode();
-        String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.GCRK.getBillType());
@@ -418,8 +421,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         scmApplyInboundVehQueryDto.setIunit("辆");
         scmApplyInboundVehQueryDto.setNum("1");
         scmApplyInboundVehQueryDto.setSettleMoney(baseTrailer.getSettlementPrice().toString());
-        scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+        scmApplyInboundVehQueryDto.setLocalName("正式仓库");
-        scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+        scmApplyInboundVehQueryDto.setLocalCode("ARZSCK");
         scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
         scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
         String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData();

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

@@ -485,7 +485,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
         for (BaseVehicleDto baseVehicleDto1 : dto) {
             ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
-            scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
+            scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo().substring(baseVehicleDto1.getVinNo().length() - 8));
             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
             scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());
@@ -534,7 +534,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
         for (BaseVehicleDto baseVehicleDto1 : dto) {
             ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
-            scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
+            scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo().substring(baseVehicleDto1.getVinNo().length() - 8));
             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
             scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -140,7 +140,8 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
         dto.setVehicleStateKey(VehicleState.StockEnum.STOCK.getCode());
         dto.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
         dto.setPriceDate(DateUtil.formatDate(new Date()));
-        String billNo = getGCRKApplyCode(dto.getUserSid());
+        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(dto.getVinNo(),dto.getCreateOrg());
+        String billNo = getGCRKApplyCode(baseVehicle);
         dto.setBillNo(billNo);
         baseVehinstallService.saveOrUpdateDto(dto);
         if (StringUtils.isBlank(dto.getSid())) {
@@ -246,19 +247,18 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
         scmApplyInboundVehQueryDto.setIunit("辆");
         scmApplyInboundVehQueryDto.setNum("1");
         scmApplyInboundVehQueryDto.setSettleMoney(dto.getCostPrice());
-        scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+        scmApplyInboundVehQueryDto.setLocalName("正式仓库");
-        scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+        scmApplyInboundVehQueryDto.setLocalCode("ARZSCK");
         scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
         scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
         String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData();
         return sid;
     }
 
-    public String getGCRKApplyCode(String userSid) {
+    public String getGCRKApplyCode(BaseVehicle baseVehicle) {
-        //获取分公司sid
+        String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = basePurchaseSystemDetailsVo.getOrgCode();
-        String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.SZRK.getBillType());

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

@@ -284,7 +284,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                 //批号:FLot
                 sf.setFLot(scmApplyInboundVehQueryDetailsVo.getVinNo());
                 //物料编码:FMaterialId  (必填项)
-                sf.setFMaterialId(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
+                sf.setFMaterialId(scmApplyInboundVehQueryDetailsVo.getVinNo());
                 //仓库:FStockId-目前只分在途和正式两个仓库。
                 //仓库编码
                 sf.setFStockId("ARZSCK");