问题优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -82,6 +82,11 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/createPdfNew")
     @ResponseBody
     ResultBean<PdfPath> createPdfNew(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType);
+
+    @ApiOperation("重推销售出库单")
+    @PostMapping("/ctxsckd")
+    @ResponseBody
+    ResultBean ctxsckd(@RequestParam("xsckdSid") String xsckdSid);
 }
 
 

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

@@ -118,4 +118,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         PdfPath pdf = baseVehicleOutService.createPdfNew(xsckdSid,printerType);
         return rb.success().setData(pdf);
     }
+
+    @Override
+    public ResultBean ctxsckd(String xsckdSid) {
+        return baseVehicleOutService.ctxsckd(xsckdSid);
+    }
 }

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

@@ -1993,4 +1993,59 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
         return pdfPath;
     }
+
+    public ResultBean ctxsckd(String xsckdSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleOut baseVehicleOut = fetchBySid(xsckdSid);
+        //获取销售出库单信息
+        BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOut.getMainSid());
+        //获取销售出库单车辆信息
+        List<BaseVehicleOut> baseVehicleOuts = baseMapper.fetchByMainSid(baseVehicleOutApply.getSid());
+        List<BaseVehicleZSOutDto> zcDtos = new ArrayList<>();
+        List<BaseVehicleOut> zcDtosDK = new ArrayList<>();
+        List<BaseVehicleZSOutDto> gcOrSzDtos = new ArrayList<>();
+        for (BaseVehicleOut vehicleOut : baseVehicleOuts) {
+            String materialName = vehicleOut.getMaterialName();
+            if ("主车".equals(materialName)) {
+                BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
+                BeanUtil.copyProperties(vehicleOut, baseVehicleZSOutDto);
+                zcDtos.add(baseVehicleZSOutDto);
+                zcDtosDK.add(vehicleOut);
+            } else {
+                BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
+                BeanUtil.copyProperties(vehicleOut, baseVehicleZSOutDto);
+                gcOrSzDtos.add(baseVehicleZSOutDto);
+            }
+        }
+        String payTypeKey = baseVehicleOutApply.getSaleTypeKey();
+        if ("001".equals(payTypeKey)) {//全款
+            //推送所有主车销售出库单
+            SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
+            finKingDeeFeign.draftSalOutStock(salOutStock);
+            //推送所有上装或挂车销售出库单
+            if (gcOrSzDtos.size() > 0) {
+                SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply);
+                finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+            }
+        } else {//贷款
+            List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
+            for (BaseVehicleOut vehicleOut : zcDtosDK) {
+                BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
+                //推送主车销售出库单
+                SalOutStock salOutStock = createZSSalOutStock(baseVehicle, baseVehicleOut, baseVehicleOutApply);
+                finKingDeeFeign.draftSalOutStock(salOutStock);
+                for (BaseVehicleZSOutDto gcOrSzDto : gcOrSzDtos) {
+                    if (gcOrSzDto.getVinSid().equals(vehicleOut.getVinSid())){
+                        gcOrSzDtosDK.add(gcOrSzDto);
+                    }
+                }
+                //推送主车对应的上装或挂车销售出库单
+                if (gcOrSzDtosDK.size() > 0) {
+                    SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply);
+                    finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                }
+            }
+        }
+        return rb.success();
+    }
 }