From 3e6e6857e7ab003f2218808f7f1da76cb79d81a4 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 21 Oct 2022 18:06:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E8=BD=A6?= =?UTF-8?q?=E8=B0=83=E8=B4=A6=20=E7=BD=91=E5=85=B3isadj=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index b104d180f1..58cb6334dc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -675,10 +675,19 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if (formVariables == null) { + map.put("isAdj", i); + bv.setFormVariables(map); + } else { + formVariables.put("isAdj", i); + } if (baseAccadjApply.getAccadjTypeValue().equals("调入")) { String callOutOrgSid = baseAccadjApply.getCallOutOrgSid(); List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); - Boolean i = false; + for (String s : purchaseSids) { BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); @@ -688,14 +697,7 @@ public class BaseAccadjApplyService extends MybatisBaseService map = new HashMap<>(); - Map formVariables = bv.getFormVariables(); - if (formVariables == null) { - map.put("isAdj", i); - bv.setFormVariables(map); - } else { - formVariables.put("isAdj", i); - } + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); From 7f0bf505baee65b0732651b9fa0737561548a102 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 21 Oct 2022 18:12:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleExamineService.java | 253 ++++++++++-------- 1 file changed, 135 insertions(+), 118 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 19ddf48680..7470fc8c01 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/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 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,130 +593,123 @@ public class ScmVehicleExamineService extends MybatisBaseService list = new ArrayList(); - list.add(baseVehicleDto); - baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode()); - - scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); - List factoryImage = dto.getFactoryImage(); - for (String s : factoryImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType("01"); - scmFile1.setFileName("厂家验车照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile1); - } - scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); - List carInspectedImage = dto.getCarInspectedImage(); - for (String s : carInspectedImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile2 = new ScmFile(); - scmFile2.setAttachType("02"); - scmFile2.setFileName("验车相关照片"); - scmFile2.setFilePath(s2); - scmFile2.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile2); - } - return rb.success().setMsg("操作成功！"); - - } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { - return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); + if ("1".equals(scmVehicleExamine.getInspectionResult())) { + scmVehicleExamine.setVinNo(dto.getVin()); + scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); + scmVehicleExamine.setModelName(dto.getModel()); + scmVehicleExamine.setConfigName(dto.getConfig()); + scmVehicleExamine.setRemarks(dto.getRemarks()); + scmVehicleExamine.setAddress(dto.getAddress()); + scmVehicleExamine.setAddressCode(dto.getLocation()); + scmVehicleExamine.setInspectionResult("2"); + scmVehicleExamine.setPrice(dto.getPrice()); + scmVehicleExamine.setInspection(data.getName()); + scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); + scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String inspectionDate = simpleDateFormat.format(new Date()); + scmVehicleExamine.setInspectionDate(inspectionDate); + scmVehicleExamine.setInboundDate(dto.getInboundDate()); + scmVehicleExamine.setEngineNo(dto.getEngineNo()); + baseMapper.updateById(scmVehicleExamine); + // 通过验车 并保存入库单 + AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); + // 业务sid + carWarehousingDto.setBusinessSid(scmVehicleExamine.getBusinessSid()); + carWarehousingDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo()); + carWarehousingDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain()); + //车架号 + carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); + carWarehousingDto.setEngineNo(scmVehicleExamine.getEngineNo()); + carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); + carWarehousingDto.setModelSid(scmVehicleExamine.getModelSid()); + carWarehousingDto.setConfigSid(scmVehicleExamine.getConfigSid()); + carWarehousingDto.setConfigName(scmVehicleExamine.getConfigName()); + carWarehousingDto.setVehicleSid(scmVehicleExamine.getVehicleSid()); + //订单类型 + carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); + carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); + carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); + carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); + carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); + carWarehousingDto.setInboundFactoryDate(scmVehicleExamine.getInboundDate()); + carWarehousingDto.setInboundState("1"); + carWarehousingDto.setUseOrgSid(useOrgSid); + carWarehousingDto.setUseOrgName(sysOrganizationVo.getName()); + scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); + //如果订单为外采订单向待付款列表推送数据 + if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) { + BaseOutsourcingApplicationDetailsVo outsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleExamine.getBusinessSid()).getData(); + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setApplySid(scmVehicleExamine.getBusinessSid()); + finPaymentrecordDto.setCreateOrgSid(scmVehicleExamine.getUseOrgSid()); + finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid()); + finPaymentrecordDto.setPayCompanySid(scmVehicleExamine.getUseOrgSid()); //付款单位sid + finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款 + finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别 + finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别 + finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称 + finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称 + finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号 + 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());//供应商编码 } - } else { - return rb.fail().setMsg("车辆检查表项目必须全部通过！"); + finPaymentrecordFeign.save(finPaymentrecordDto); + } + //车辆台账推送数据 + BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); + baseVehicleDto.setVinNo(dto.getVin()); + baseVehicleDto.setUseOrgSid(useOrgSid); + baseVehicleDto.setWarrantyCardNo(dto.getGuaranteeCardNo());//保修卡卡号 + baseVehicleDto.setSpecialInstructions(dto.getModelDifferenceExplain());//特殊配置差异说明 + List list = new ArrayList(); + list.add(baseVehicleDto); + baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode()); + + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); + List factoryImage = dto.getFactoryImage(); + for (String s : factoryImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType("01"); + scmFile1.setFileName("厂家验车照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile1); + } + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); + List carInspectedImage = dto.getCarInspectedImage(); + for (String s : carInspectedImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile2 = new ScmFile(); + scmFile2.setAttachType("02"); + scmFile2.setFileName("验车相关照片"); + scmFile2.setFilePath(s2); + scmFile2.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile2); } + return rb.success().setMsg("操作成功！"); + + } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { + return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); } - return rb.fail().setMsg("操作失败！"); + return rb.success(); } - public ResultBean getToDoNum(String userSid,String orgPath) { + public ResultBean getToDoNum(String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } int count = baseMapper.getToDoNum(orgPath); From f8d8317736403b49a713e57777630618fb565d70 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 21 Oct 2022 18:37:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E5=85=A5=E4=BB=93=E5=BA=93=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=EF=BC=9A=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E4=BB=93=E5=BA=93=20=E6=AF=8F=E9=9A=94?= =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E9=83=BD=E6=9C=89=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=E4=BB=93=E5=BA=93=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/kingdee/stktransferdirect/StkTransferDirectService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java index 535a86b856..2beddc3337 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java @@ -33,6 +33,7 @@ public class StkTransferDirectService extends FinKingDeeService { Map map_fEntityModel_= object2Map(stkTransferDirect); List fBillEntry = stkTransferDirect.getFBillEntry(); for (StkTransferDirect.FBillEntry f: fBillEntry){ + f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每隔分公司都有这个编码的仓库。 //单据查看的json模板 String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_MATERIAL.getID(), f.getFMaterialId()); ResultBean kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(), getKDForNumbers, From 2e0c8efa80939bcaf64e8001f545767ddb938d3a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 22 Oct 2022 09:36:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppScmVehicleExamineSubmitDto.java | 3 + .../ScmVehicleExamineService.java | 268 ++++++++---------- 2 files changed, 128 insertions(+), 143 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java index 78272d07dd..e6a75ca117 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineSubmitDto.java @@ -57,4 +57,7 @@ public class AppScmVehicleExamineSubmitDto implements Dto { @ApiModelProperty("发动机号") private String engineNo; + @ApiModelProperty("机构sid") + private String orgPath; + } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 7470fc8c01..488f48a74f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -29,12 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; -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; @@ -119,9 +115,6 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -179,7 +172,7 @@ public class ScmVehicleExamineService extends MybatisBaseService selectCarInspectedList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); pagerQuery.getParams().setUseOrgSid(useOrgSid); QueryWrapper qw = carInspectedQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.selectCarInspectedList(page, qw); @@ -562,154 +555,143 @@ public class ScmVehicleExamineService extends MybatisBaseService 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("车辆检查表项目必须全部通过！"); - } - + String orgPath = dto.getOrgPath(); + String orgName = ""; + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + } + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); + if(sysOrganizationVoResultBean.getSuccess()){ + SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); + orgName = sysOrganizationVo.getName(); } - 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(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); +// SysOrganizationVo data1 = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); String s1 = ""; String s2 = ""; String type1 = "01"; //厂家验车照片 String type2 = "02"; //验车相关照片 - if ("1".equals(scmVehicleExamine.getInspectionResult())) { - scmVehicleExamine.setVinNo(dto.getVin()); - scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); - scmVehicleExamine.setModelName(dto.getModel()); - scmVehicleExamine.setConfigName(dto.getConfig()); - scmVehicleExamine.setRemarks(dto.getRemarks()); - scmVehicleExamine.setAddress(dto.getAddress()); - scmVehicleExamine.setAddressCode(dto.getLocation()); - scmVehicleExamine.setInspectionResult("2"); - scmVehicleExamine.setPrice(dto.getPrice()); - scmVehicleExamine.setInspection(data.getName()); - scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); - scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String inspectionDate = simpleDateFormat.format(new Date()); - scmVehicleExamine.setInspectionDate(inspectionDate); - scmVehicleExamine.setInboundDate(dto.getInboundDate()); - scmVehicleExamine.setEngineNo(dto.getEngineNo()); - baseMapper.updateById(scmVehicleExamine); - // 通过验车 并保存入库单 - AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); - // 业务sid - carWarehousingDto.setBusinessSid(scmVehicleExamine.getBusinessSid()); - carWarehousingDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo()); - carWarehousingDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain()); - //车架号 - carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); - carWarehousingDto.setEngineNo(scmVehicleExamine.getEngineNo()); - carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); - carWarehousingDto.setModelSid(scmVehicleExamine.getModelSid()); - carWarehousingDto.setConfigSid(scmVehicleExamine.getConfigSid()); - carWarehousingDto.setConfigName(scmVehicleExamine.getConfigName()); - carWarehousingDto.setVehicleSid(scmVehicleExamine.getVehicleSid()); - //订单类型 - carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); - carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); - carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); - carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); - carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); - carWarehousingDto.setInboundFactoryDate(scmVehicleExamine.getInboundDate()); - carWarehousingDto.setInboundState("1"); - carWarehousingDto.setUseOrgSid(useOrgSid); - carWarehousingDto.setUseOrgName(sysOrganizationVo.getName()); - scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); - //如果订单为外采订单向待付款列表推送数据 - if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) { - BaseOutsourcingApplicationDetailsVo outsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleExamine.getBusinessSid()).getData(); - FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); - finPaymentrecordDto.setApplySid(scmVehicleExamine.getBusinessSid()); - finPaymentrecordDto.setCreateOrgSid(scmVehicleExamine.getUseOrgSid()); - finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid()); - finPaymentrecordDto.setPayCompanySid(scmVehicleExamine.getUseOrgSid()); //付款单位sid - finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款 - finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别 - finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别 - finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称 - finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称 - finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号 - 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());//供应商编码 - } - finPaymentrecordFeign.save(finPaymentrecordDto); - } - //车辆台账推送数据 - BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); - baseVehicleDto.setVinNo(dto.getVin()); - baseVehicleDto.setUseOrgSid(useOrgSid); - baseVehicleDto.setWarrantyCardNo(dto.getGuaranteeCardNo());//保修卡卡号 - baseVehicleDto.setSpecialInstructions(dto.getModelDifferenceExplain());//特殊配置差异说明 - List list = new ArrayList(); - list.add(baseVehicleDto); - baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode()); - - scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); - List factoryImage = dto.getFactoryImage(); - for (String s : factoryImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType("01"); - scmFile1.setFileName("厂家验车照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile1); - } - scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); - List carInspectedImage = dto.getCarInspectedImage(); - for (String s : carInspectedImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + 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()); + scmVehicleExamine.setModelName(dto.getModel()); + scmVehicleExamine.setConfigName(dto.getConfig()); + scmVehicleExamine.setRemarks(dto.getRemarks()); + scmVehicleExamine.setAddress(dto.getAddress()); + scmVehicleExamine.setAddressCode(dto.getLocation()); + scmVehicleExamine.setInspectionResult("2"); + scmVehicleExamine.setPrice(dto.getPrice()); + scmVehicleExamine.setInspection(data.getName()); + scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); + scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String inspectionDate = simpleDateFormat.format(new Date()); + scmVehicleExamine.setInspectionDate(inspectionDate); + scmVehicleExamine.setInboundDate(dto.getInboundDate()); + scmVehicleExamine.setEngineNo(dto.getEngineNo()); + baseMapper.updateById(scmVehicleExamine); + // 通过验车 并保存入库单 + AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); + // 业务sid + carWarehousingDto.setBusinessSid(scmVehicleExamine.getBusinessSid()); + carWarehousingDto.setWarrantyCardNo(scmVehicleExamine.getGuaranteeCardNo()); + carWarehousingDto.setSpecialInstructions(scmVehicleExamine.getModelDifferenceExplain()); + //车架号 + carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); + carWarehousingDto.setEngineNo(scmVehicleExamine.getEngineNo()); + carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); + carWarehousingDto.setModelSid(scmVehicleExamine.getModelSid()); + carWarehousingDto.setConfigSid(scmVehicleExamine.getConfigSid()); + carWarehousingDto.setConfigName(scmVehicleExamine.getConfigName()); + carWarehousingDto.setVehicleSid(scmVehicleExamine.getVehicleSid()); + //订单类型 + carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); + carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); + carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); + carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); + carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); + carWarehousingDto.setInboundFactoryDate(scmVehicleExamine.getInboundDate()); + carWarehousingDto.setInboundState("1"); + carWarehousingDto.setUseOrgSid(orgPath); + carWarehousingDto.setUseOrgName(orgName); + scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); + //如果订单为外采订单向待付款列表推送数据 + if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleExamine.getPurchaseTypeKey())) { + BaseOutsourcingApplicationDetailsVo outsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleExamine.getBusinessSid()).getData(); + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setApplySid(scmVehicleExamine.getBusinessSid()); + finPaymentrecordDto.setCreateOrgSid(scmVehicleExamine.getUseOrgSid()); + finPaymentrecordDto.setUseOrgSid(scmVehicleExamine.getUseOrgSid()); + finPaymentrecordDto.setPayCompanySid(scmVehicleExamine.getUseOrgSid()); //付款单位sid + finPaymentrecordDto.setPayType(1); // 付款类别，1付款/2退款 + finPaymentrecordDto.setCostTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); // 款项类别 + finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别 + 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(""); + finPaymentrecordFeign.save(finPaymentrecordDto); + } + //车辆台账推送数据 + BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); + baseVehicleDto.setVinNo(dto.getVin()); + baseVehicleDto.setUseOrgSid(orgPath); + baseVehicleDto.setWarrantyCardNo(dto.getGuaranteeCardNo());//保修卡卡号 + baseVehicleDto.setSpecialInstructions(dto.getModelDifferenceExplain());//特殊配置差异说明 + List list = new ArrayList(); + list.add(baseVehicleDto); + baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.UPDATE_VEHICLE.getCode()); + + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); + List factoryImage = dto.getFactoryImage(); + for (String s : factoryImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType("01"); + scmFile1.setFileName("厂家验车照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile1); + } + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); + List carInspectedImage = dto.getCarInspectedImage(); + for (String s : carInspectedImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile2 = new ScmFile(); + scmFile2.setAttachType("02"); + scmFile2.setFileName("验车相关照片"); + scmFile2.setFilePath(s2); + scmFile2.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile2); + } + return rb.success().setMsg("操作成功！"); + + } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { + return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); } - ScmFile scmFile2 = new ScmFile(); - scmFile2.setAttachType("02"); - scmFile2.setFileName("验车相关照片"); - scmFile2.setFilePath(s2); - scmFile2.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile2); + } else { + return rb.fail().setMsg("车辆检查表项目必须全部通过！"); } - return rb.success().setMsg("操作成功！"); - - } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { - return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); } - return rb.success(); + return rb.fail().setMsg("操作失败！"); } - public ResultBean getToDoNum(String userSid, String orgPath) { + public ResultBean getToDoNum(String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); - if (StringUtils.isBlank(orgPath)) { + if(StringUtils.isBlank(orgPath)){ orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } int count = baseMapper.getToDoNum(orgPath); From 5592f3eba8e44bb5f846a6aa74b401e7e44a84a1 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Sat, 22 Oct 2022 11:39:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=87=91=E8=9D=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/biz/kingdee/paezcllx/PaezCllxService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/paezcllx/PaezCllxService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/paezcllx/PaezCllxService.java index be8e24e132..9060f2ad19 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/paezcllx/PaezCllxService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/paezcllx/PaezCllxService.java @@ -5,6 +5,7 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.paezcllx.PaezCllx; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig; import com.yxt.anrui.fin.biz.kingdee.bank.BDBankService; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +52,7 @@ public class PaezCllxService extends FinKingDeeService { String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.PAEZ_CLLX.getID()); ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.PAEZ_CLLX.getID(), - submitKD,KingDeeBillUrl.SUBMIT_URL.getURL()); + submitKD, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator ,KingDeeBillUrl.SUBMIT_URL.getURL()); if(!resultBean1.getSuccess()){ log.info("车辆类型提交失败!"); return rb.setMsg("车辆类型提交失败!");