Merge remote-tracking branch 'origin/master'

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

@@ -1553,9 +1553,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private QueryWrapper<BaseVehicle> vehicleReturnWrapper(BaseChoiceVehicleQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
-            if (StringUtils.isNotBlank(params.getUserSid())) {
+            /*if (StringUtils.isNotBlank(params.getUserSid())) {
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.useOrgSid", orgSid);
+            }*/
+            //分公司
+            if(org.apache.commons.lang3.StringUtils.isNotBlank(params.getOrgPath())){
+                String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+                qw.eq("createOrgSid",orgSid);
             }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
@@ -19,6 +20,7 @@ import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
@@ -90,6 +92,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private BaseVehicleOutApplyService baseVehicleOutApplyService;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@@ -188,6 +192,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         if ("002".equals(baseVehicle.getManPurOrderTypeKey())) {
             baseVehicleOut.setZcMGroupCode("99.01");
             baseVehicleOut.setZcMGroupName("外采主车");
+        }else {
+            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle.getCarBrandSid());
+            baseVehicleOut.setZcMGroupCode(baseVehicleBrand.getBrandCode());
+            baseVehicleOut.setZcMGroupName(baseVehicleBrand.getBrandName());
         }
         if (StringUtils.isNotBlank(dto.getPrice())) {
             baseVehicleOut.setPrice(new BigDecimal(dto.getPrice()));
@@ -796,10 +804,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
 
     public PdfPath createPdf(String xsckdSid,String printerType) {
         PdfPath pdfPath = new PdfPath();
+        BaseVehicleOut baseVehicleOut1 = fetchBySid(xsckdSid);
         //获取销售出库单信息
-        BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(xsckdSid);
+        BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOut1.getMainSid());
         //获取销售出库单车辆信息
-        List<BaseVehicleOut> baseVehicleOuts = baseMapper.fetchByMainSid(xsckdSid);
+        List<BaseVehicleOut> baseVehicleOuts = baseMapper.fetchByMainSid(baseVehicleOutApply.getSid());
         //获取创建人姓名
         String createBySid = baseVehicleOutApply.getCreateBySid();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(createBySid).getData();
@@ -911,8 +920,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         String targetPath = sourcePath + dateStr;
         if (printerType.equals("针孔式打印机")){
             WordUtils.creatWord(dataMap, "xsckdzks", sourcePath, targetPath, typeName);
-        }else if (printerType.equals("喷墨式打印机")){
-            WordUtils.creatWord(dataMap, "xsckdpms", sourcePath, targetPath, typeName);
+        }else if (printerType.equals("激光打印机")){
+            WordUtils.creatWord(dataMap, "xsckdjg", sourcePath, targetPath, typeName);
         }
         //新生成的word路径
         String wordPath = targetPath + "\\" + typeName;