验车问题修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -561,6 +562,29 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         if (StringUtils.isBlank(dto.getInboundDate())) {
             return rb.setMsg("厂家入库日期不能为空");
         }
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        if (StringUtils.isNotBlank(dto.getInspectedSid())) {
+            Boolean aBoolean = scmVehinspectItemService.selByTrueAndFalse(dto.getInspectedSid());
+            ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
+            if (dto.isEditVin()) {
+                ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(dto.getVin(), useOrgSid);
+                if (baseVehicleResultBean.getData() == null) {
+                    return rb.setMsg("车架号已存在请重新输入!");
+                }
+                saveAll(scmVehicleExamine, dto);
+            }
+            if (aBoolean) {
+                saveAll(scmVehicleExamine, dto);
+            } else {
+                return rb.fail().setMsg("车辆检查表项目必须全部通过！");
+            }
+
+        }
+        return rb.fail().setMsg("操作失败！");
+    }
+
+    public ResultBean saveAll(ScmVehicleExamine scmVehicleExamine, AppScmVehicleExamineSubmitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
@@ -569,10 +593,6 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String s2 = "";
         String type1 = "01"; //厂家验车照片
         String type2 = "02"; //验车相关照片
-        if (StringUtils.isNotBlank(dto.getInspectedSid())) {
-            Boolean aBoolean = scmVehinspectItemService.selByTrueAndFalse(dto.getInspectedSid());
-            if (aBoolean) {
-                ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
         if ("1".equals(scmVehicleExamine.getInspectionResult())) {
             scmVehicleExamine.setVinNo(dto.getVin());
             scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
@@ -631,14 +651,15 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称
                 finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称
                 finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号
-                        finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());
-                        Integer price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());
-                        Integer num = outsourcingApplicationDetailsVo.getNum();
-                        finPaymentrecordDto.setCost(price * num - Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit()));
-                        finPaymentrecordDto.setBusSid("");
+                finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());// 收款单位
+                int price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());//采购价格
+                Integer num = outsourcingApplicationDetailsVo.getNum();//采购数量
+                int deposit = Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit());//订金
+                finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid
                 BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getSupplierSid()).getData();
                 if (baseManufacturerAllVo != null) {
-                            finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());
+                    finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//供应商编码
                 }
                 finPaymentrecordFeign.save(finPaymentrecordDto);
             }
@@ -683,11 +704,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
             return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交");
         }
-            } else {
-                return rb.fail().setMsg("车辆检查表项目必须全部通过！");
-            }
-        }
-        return rb.fail().setMsg("操作失败！");
+        return rb.success();
     }
 
     public ResultBean<String> getToDoNum(String userSid, String orgPath) {