From 650bcd2b187dfd3b87a50df4982deb3cd51e7df0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 21 Oct 2022 18:03:51 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicle/BaseVehicleRest.java | 41 ++++++------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 4379c96190..3d82b900c4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -365,6 +365,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (pcResubean.getSuccess()) { SysOrganizationVo vo = pcResubean.getData(); if (vo != null) { + //采购部门 stkInStock.setFPurchaseDeptId(vo.getOrgCode()); } } @@ -376,22 +377,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { * // 入库日期:FDate (必填项) */ stkInStock.setFDate(DateUtil.now()); - /** - * // 采购部门:FPurchaseDeptId (必填项) - */ -// stkInStock.setFPurchaseDeptId("05.04"); - /** - * //采购组织:FPurchaseOrgId (必填项) - */ -// stkInStock.setFPurchaseOrgId("101"); - /** - * // 供应商:FSupplierId (必填项) - */ -// stkInStock.setFSupplierId("010001"); - /** - * //分配目标组织:TOrgId (必填项) - */ -// stkInStock.setTOrgId("100012"); + /** * // 物料列表:FInStockEntry (必填项) */ @@ -409,6 +395,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 单价 对应厂家结算价 */ sf.setFPrice(baseVehicleDto.getCostPrice() + ""); + + /** + * 车辆类型 + */ + //厂家采购 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //根据sid查询 @@ -417,20 +408,17 @@ public class BaseVehicleRest implements BaseVehicleFeign { sf.setCllx(baseManufacturerBank.getActualPayKey()); sf.setCllxType("sellChannel"); } - } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { - /** - * 车辆类型 - */ + //车辆类型-外采主车 sf.setCllx("60"); sf.setCllxType("sellChannel"); + //物料分组-外采主车 sf.setWlfz("99.01"); - //sf.setFCategoryID("CHLB03_SYS");//外采车 } + //存货类别 sf.setFCategoryIDType("purchaseOrderType"); sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey()); -// sf.setCllx("03");//TODO 需要根据车辆对应的车型 分析出车辆类型 推送到车辆台账中 规则：1.车辆类型—>优先考虑LNG的类型，然后再是牵引、载货等。 -// sf.setCllxType("03"); + /** * // 批号:FLot */ @@ -440,7 +428,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { */ sf.setFMaterialId(baseVehicleDto.getVinNo()); /** - * // 仓库:FStockId + * // 仓库:FStockId-目前只分在途和正式两个仓库。 */ if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 @@ -453,11 +441,6 @@ public class BaseVehicleRest implements BaseVehicleFeign { } } -// sf.setWlfz("01"); - /** - * 物料分组 - */ - // sf.setWlfzType("01"); fInStockEntry.add(sf); } stkInStock.setFInStockEntry(fInStockEntry); From 3e6e6857e7ab003f2218808f7f1da76cb79d81a4 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Fri, 21 Oct 2022 18:06:58 +0800 Subject: [PATCH 02/12] =?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 03/12] =?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 04/12] =?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 05/12] =?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 06/12] =?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("车辆类型提交失败!"); From e3988513b39287a87b6ff5b0e40519f5934656cf Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 22 Oct 2022 14:38:14 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E8=B0=83=E8=B4=A6=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0915d034f6..ce3dff1ea3 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -31,7 +31,7 @@ public enum ProcDefEnum { FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:717504"), //测试调账流程定义id -// BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id + //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"), SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"), From 2fbf0cfdcffb4f4bfa15a7c2f13969724a4812b2 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Sat, 22 Oct 2022 15:50:29 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9A=84=E9=87=91=E8=9D=B6=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/FinKingDeeService.java | 2 +- .../biz/kingdee/bdmaterial/BdMaterialService.java | 14 +++++++------- .../fin/biz/kingdee/paezcllx/PaezCllxService.java | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java index 8e506ad282..698eade787 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java @@ -39,7 +39,7 @@ public class FinKingDeeService { return listResultBean; } /** - * 调用金蝶的保存接口 + * 调用金蝶的查询接口 * @param data * @return */ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 9dfaefe358..6e2bbf24ef 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -347,7 +347,7 @@ public class BdMaterialService extends FinKingDeeService { */ public ResultBean unAudit(BdMaterial bdMaterial) throws Exception { ResultBean rb=ResultBean.fireFail(); - JSONObject result = viewBdMaterial(KingDeeBillId.BD_MATERIAL.getID(),bdMaterial.getOldFName()); + JSONObject result = view(KingDeeBillId.BD_MATERIAL.getID(),bdMaterial.getOldFName()); JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); if(responseStatus!=null){//不存在该物料 //新增物料 return rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg()); @@ -367,16 +367,16 @@ public class BdMaterialService extends FinKingDeeService { /** * 查看物料 * @param formid - * @param oldFName + * @param Number * @return * @throws Exception */ - private JSONObject viewBdMaterial(String formid,String oldFName) throws Exception { - String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_MATERIAL.getID(), oldFName); + /* private JSONObject viewBdMaterial(String formid,String oldFName) throws Exception { + String getKDForNumbers = getGetKDForNumbers(formid, oldFName); return view(formid,getKDForNumbers); - } - - private JSONObject view(String formid,String getKDForNumbers) throws Exception { + }*/ + private JSONObject view(String formid,String Number) throws Exception { + String getKDForNumbers = getGetKDForNumbers(formid, Number); ResultBean kingDataInfoByNumber = accessKingDeeInterface(formid, getKDForNumbers, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator, KingDeeBillUrl.VIEW_URL.getURL()); log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); 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 9060f2ad19..c581f8cc85 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 @@ -51,6 +51,7 @@ public class PaezCllxService extends FinKingDeeService { KingDeeBillId.PAEZ_CLLX.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.PAEZ_CLLX.getID()); + log.info("draftPaezCllx-submitKD:{}",submitKD); ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.PAEZ_CLLX.getID(), submitKD, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator ,KingDeeBillUrl.SUBMIT_URL.getURL()); if(!resultBean1.getSuccess()){ From b67ad5da1a189a2f0a5f0aa5302efb5ce352ffd1 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 22 Oct 2022 16:17:03 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E3=80=81=E5=87=BA=E5=BA=93=E5=8D=95=E3=80=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=AD=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerFeign.java | 2 +- .../base/api/basevehicle/BaseVehicle.java | 16 ++++ .../base/api/basevehicle/BaseVehicleDto.java | 17 ++++ .../api/basevehicle/BaseVehicleSelectVo.java | 17 ++++ .../base/api/basevehicle/BaseVehicleVo.java | 17 +++- .../BaseAccadjApplyService.java | 7 +- .../BaseManufacturerRest.java | 2 +- .../BaseManufacturerService.java | 4 +- .../base/biz/basevehicle/BaseVehicleRest.java | 77 ++++++++++++++----- .../biz/basevehicle/BaseVehicleService.java | 49 ++++++++++++ .../basevehicleout/BaseVehicleOutService.java | 15 ++-- .../BusVehicleApplyService.java | 9 ++- .../ScmApplyInboundService.java | 35 ++++++++- .../ScmVehicleEnterlibraryService.java | 51 ++++++++++-- 14 files changed, 272 insertions(+), 46 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index be3685d672..02a9db1614 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -194,7 +194,7 @@ public interface BaseManufacturerFeign { @ApiOperation("根据分公司sid和厂商sid查询供应商sid") @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}") @ResponseBody - ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); + ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); @ApiOperation("根据车型sid查询品牌、厂商等信息") @GetMapping("/getManDetails/{modelSid}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index 2aafd11df3..d9e0701286 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -160,4 +160,20 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 153711439c..95fd1e2448 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -128,4 +128,21 @@ public class BaseVehicleDto implements Dto { private String manufacturerSid; @ApiModelProperty(value = "供应商sid") private String supplierSid; + + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index d2abb709da..765c57764f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -133,4 +133,21 @@ public class BaseVehicleSelectVo implements Vo { private String manufacturerSid; @ApiModelProperty(value = "供应商sid") private String supplierSid; + + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index d85afbde96..29baae326d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -130,7 +130,22 @@ public class BaseVehicleVo implements Vo { private String manufSaleAccessSid; @ApiModelProperty(value = "厂家销售通路名称") private String manufSaleAccessName; - + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; //车型配置 @ApiModelProperty("车身颜色(陕汽必须的字段)") private String carColor; 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 58cb6334dc..19ef43fc9d 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 @@ -606,7 +606,7 @@ public class BaseAccadjApplyService extends MybatisBaseService voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); + fe.setFStockID(baseVehicle.getLocationCode()); + /*ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); if (voResultBean.getSuccess()) { fe.setFStockID(voResultBean.getData().getGressionCode()); // fe.setFStockID("CK001"); //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid()); - } + }*/ /** * 库存状态:FStockStatusID */ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 91eb95b45b..4532691ece 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -208,7 +208,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { } @Override - public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { + public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 4c321150b8..3ffda0c42b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -625,10 +625,10 @@ public class BaseManufacturerService extends MybatisBaseService selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { + public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { ResultBean rb = ResultBean.fireFail(); BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid); - return rb.success().setData(baseManufacturerDetailsVo.getSid()); + return rb.success().setData(baseManufacturerDetailsVo); } public ResultBean getManDetails(String modelSid) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 3d82b900c4..f15bf38aa9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; @@ -235,6 +236,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { int count = baseVehicleService.selectCountByVinNo(vinNo); ResultBean baseVehicleVoResultBean = baseVehicleService.selVehicleByVinNo(vinNo); BaseVehicleVo data = baseVehicleVoResultBean.getData(); + BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); + if (baseManufacturerSidVo != null) { + dto.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); + dto.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); + } + buildVehicle(dto); if (count > 0) { ResultBean resultBean = update(dto, data.getSid()); if (!resultBean.getSuccess()) { @@ -243,6 +250,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setMsg(resultBean.getMsg()); } BaseVehicle baseVehicle = new BaseVehicle(); + String sid = baseVehicle.getSid(); dto.fillEntity(baseVehicle); //锁定状态 /*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode(); @@ -252,22 +260,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/ - baseVehicle.setLockedState(dto.getLockedState()); + /* baseVehicle.setLockedState(dto.getLockedState()); baseVehicle.setLockedStateValue(dto.getLockedStateValue()); baseVehicle.setVehicleState(dto.getVehicleState()); baseVehicle.setVehicleStateValue(dto.getVehicleStateValue()); baseVehicle.setSettlementStatus(dto.getSettlementStatus()); baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue()); baseVehicle.setWitPinState(dto.getWitPinState()); - baseVehicle.setWitPinStateValue(dto.getWitPinStateValue()); + baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());*/ - BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); - if (baseManufacturerSidVo != null) { - baseVehicle.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); - baseVehicle.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); - } + baseVehicle.setSid(sid); boolean isSave = baseVehicleService.save(baseVehicle); + //生成合格证信息 if (StringUtils.isNotBlank(dto.getVinNo())) { BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); baseVehicleCertificate.setVinNo(dto.getVinNo()); @@ -287,6 +292,32 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功"); } + public void buildVehicle(BaseVehicleDto dto){ + //分公司code + SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); + dto.setOrgCode(sysOrganizationVo1.getOrgCode()); + //库存地点编码 + ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(dto.getLocation()).getData(); + dto.setLocationCode(scmWarehouseVo.getGressionCode());//库存地点编码 + //部门编码 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getPurchaseSystemSid()).getData(); + dto.setPurchaseSystemCode(sysOrganizationVo.getOrgCode()); + //厂家回款通路类别key + BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(dto.getManufSaleAccessSid()); + dto.setManufSaleAccessKey(baseManufacturerBank.getActualPayKey()); + //付款通路code + dto.setPaymentAccessNoKey(baseManufacturerBank.getPaymentAccessNoKey()); + //品牌编码 + BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(dto.getCarBrandSid()); + dto.setCarBrandCode(baseVehicleBrand.getBrandCode()); + //厂商编码 + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(dto.getManufacturerSid()); + dto.setManufacturerCode(baseManufacturer.getManufacturerCode()); + //供应商code + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(dto.getSupplierSid()).getData(); + dto.setSupplierCode(sysOrganizationVo2.getOtherCode()); + } + @Override public ResultBean saveOrUpdate(List dto, String eventType) { ResultBean rb = ResultBean.fireFail(); @@ -331,9 +362,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { try { StkInStock stkInStock = new StkInStock(); BaseVehicleDto baseVehicle = dto.get(0); - String orgSid = baseVehicle.getCreateOrgSid(); + stkInStock.setFPurchaseOrgId(baseVehicle.getOrgCode()); + stkInStock.setTOrgId(baseVehicle.getOrgCode()); + stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode()); + stkInStock.setFSupplierId(baseVehicle.getSupplierCode()); + //String orgSid = baseVehicle.getCreateOrgSid(); //分公司id - ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + /*ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { @@ -342,8 +377,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { stkInStock.setTOrgId(vo.getOrgCode()); } - } - if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采 + }*/ + /*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采 //根据外采编号查询外采的申请人部门 BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo()); String createBySid = baseOutsourcingApplication.getCreateBySid(); @@ -372,7 +407,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { //车型品牌对应厂商生成的分公司的主机厂供应商编码 String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); stkInStock.setFSupplierId(manCode); - } + }*/ /** * // 入库日期:FDate (必填项) */ @@ -384,13 +419,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { List fInStockEntry = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto : dto) { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + sf.setWlfz(baseVehicleDto.getCarBrandCode()); /** * 物料分组 */ - BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); + /*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); if (baseVehicleBrand != null) { sf.setWlfz(baseVehicleBrand.getBrandCode()); - } + }*/ /** * 单价 对应厂家结算价 */ @@ -403,11 +439,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //根据sid查询 - BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); + /* BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); if (baseManufacturerBank != null) { sf.setCllx(baseManufacturerBank.getActualPayKey()); sf.setCllxType("sellChannel"); - } + }*/ + //车辆类型-厂家外采和调车 + sf.setCllx(baseVehicleDto.getManufSaleAccessKey()); + sf.setCllxType("sellChannel"); } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //车辆类型-外采主车 sf.setCllx("60"); @@ -430,7 +469,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * // 仓库:FStockId-目前只分在途和正式两个仓库。 */ - if (StringUtils.isBlank(baseVehicleDto.getLocation())) { + //仓库编码 + sf.setFStockId(baseVehicleDto.getLocationCode()); + /*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 sf.setFStockId("ARZTCK"); } else { @@ -439,7 +480,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); sf.setFStockId(data.getGressionCode()); } - } + }*/ fInStockEntry.add(sf); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 5cc992c508..c411ecb9f2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2557,6 +2557,31 @@ public class BaseVehicleService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + salOutStock.setFSaleOrgId(baseVehicle.getOrgCode()); + /*ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { salOutStock.setFSaleOrgId(vo.getOrgCode()); } - } + }*/ //客户 salOutStock.setFCustomerID(dto.getCustomerNo()); //销售部门id - ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); + salOutStock.setFSaleDeptID(baseVehicle.getPurchaseSystemCode()); + /*ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); if (resultBean1.getSuccess()) { SysOrganizationVo vo = resultBean1.getData(); if (vo != null) { salOutStock.setFSaleDeptID(vo.getOrgCode()); } - } + }*/ //项目类别key和项目类别type salOutStock.setF_PAEZ_AssistantType("payType"); salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey()); @@ -172,8 +174,9 @@ public class BaseVehicleOutService extends MybatisBaseService voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); - fEntity.setFStockID(voResultBean.getData().getGressionCode()); + fEntity.setFStockID(baseVehicle.getLocationCode()); + /*ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); + fEntity.setFStockID(voResultBean.getData().getGressionCode());*/ //销售折让 if (StringUtils.isNotBlank(dto.getSalesAllowance())) { fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index ccff2e09b1..0f0b99203f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -25,6 +25,7 @@ import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; @@ -108,6 +109,8 @@ public class BusVehicleApplyService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -520,10 +529,18 @@ public class ScmApplyInboundService extends MybatisBaseService baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode())); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 3175e087a3..d28dc5a4c7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -32,8 +32,11 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; @@ -56,6 +59,7 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -124,6 +128,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -417,17 +423,30 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid()); baseVehicleDto.setSupplierSid(applicationDetailsVo.getPurchasingUnitSid()); + //供应商code + BaseManufacturerAllVo baseManufacturerAllVo1 = baseManufacturerFeign.details(applicationDetailsVo.getPurchasingUnitSid()).getData(); + baseVehicleDto.setSupplierCode(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerCode()); if (resultBeanBaseManu.getData() != null) { + BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(resultBeanBaseManu.getData().getManufacturerSid()).getData(); baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid()); + baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//厂商编码 baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid()); baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName()); + //品牌编码 + BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(resultBeanBaseManu.getData().getBrandSid()); + baseVehicleDto.setCarBrandCode(baseVehicleBrand.getBrandCode()); } } + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(scmVehicleEnterlibrary.getUseOrgSid()).getData(); + baseVehicleDto.setOrgCode(sysOrganizationVo.getOrgCode()); baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName()); baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); @@ -436,6 +455,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService stringResultBean = baseManufacturerFeign.selectByInternalPurchaseSid(internalPurchaseDetailsVo.getBuyerOrgSid(), internalPurchaseDetailsVo.getSellerOrgName()); - if (stringResultBean.getData() != null) { - baseVehicleDto.setSupplierSid(stringResultBean.getData()); - } + baseVehicleDto.setSupplierSid(internalPurchaseDetailsVo.getSellerOrgSid()); + //供应商code + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getSellerOrgSid()).getData(); + baseVehicleDto.setSupplierCode(sysOrganizationVo2.getOtherCode()); //厂商sid 品牌 和 品牌 sid BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(internalPurchaseDetailsVo.getBrandSid()); if (baseVehicleBrand != null) { baseVehicleDto.setManufacturerSid(baseVehicleBrand.getManufacturerSid()); + BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData(); + baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//厂商编码 } baseVehicleDto.setCarBrandSid(internalPurchaseDetailsVo.getBrandSid()); baseVehicleDto.setCarBrandName(internalPurchaseDetailsVo.getBrandName()); + //品牌编码 + baseVehicleDto.setCarBrandCode(baseVehicleBrand.getBrandCode()); //采购部门sid 和采购部门名称 baseVehicleDto.setPurchaseSystemSid(internalPurchaseDetailsVo.getCallInBuyerOrgSid()); baseVehicleDto.setPurchaseSystemName(internalPurchaseDetailsVo.getCallInBuyerOrgName()); + //部门编码 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getCallInBuyerOrgSid()).getData(); + baseVehicleDto.setPurchaseSystemCode(sysOrganizationVo.getOrgCode()); ResultBean baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid()); //厂家回款通路sid 厂家回款通路名称 if (baseVehicleResultBean.getData() != null) { baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid()); baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName()); + //厂家回款通路类别key + BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData(); + baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey()); + //付款通路code + baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey()); } List list = new ArrayList<>(); list.add(baseVehicleDto); @@ -548,9 +585,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService 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 9cbd8268baca472daeb94a16e1525d86ae94dc60 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Sat, 22 Oct 2022 16:25:39 +0800 Subject: [PATCH 10/12] =?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 | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 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 488f48a74f..43b377bac1 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,6 +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.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.BaseVehicleDto; @@ -115,6 +117,9 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -172,7 +177,7 @@ public class ScmVehicleExamineService extends MybatisBaseService selectCarInspectedList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); pagerQuery.getParams().setUseOrgSid(useOrgSid); QueryWrapper qw = carInspectedQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.selectCarInspectedList(page, qw); @@ -635,10 +640,15 @@ public class ScmVehicleExamineService extends MybatisBaseService Date: Sat, 22 Oct 2022 16:30:00 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=87=91=E8=9D=B6=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/kingdee/FinKingDeeService.java | 31 ++++++++ .../kingdee/bdmaterial/BdMaterialService.java | 2 +- .../StkTransferDirectService.java | 75 +++++++++++++------ 3 files changed, 86 insertions(+), 22 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java index 698eade787..b1aedc2b27 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java @@ -293,7 +293,38 @@ public class FinKingDeeService { } return new ResultBean().fail().setMsg("查询异常"); } + /** + * 审核 + * @param data + * @return + * @throws Exception + */ + public ResultBean audit( String data,String formId) throws Exception { + String auditKD = getAuditKDTempJson(formId,data); + ResultBean resultBean2 = accessKingDeeInterface(formId, auditKD,KingDeeBillUrl.AUDIT_URL.getURL()); + if(!resultBean2.getSuccess()){ + log.info(formId+"审核失败!"+data); + } + log.info(formId+"审核成功!"+data); + return resultBean2; + } + /** + * 提交 + * @param data + * @return + * @throws Exception + */ + public ResultBean submit( String data,String formId) throws Exception { + String submitKD = getSubmitKDTempJson(formId,data); + ResultBean resultBean1 = accessKingDeeInterface(formId, + submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), submitKD); + if(!resultBean1.getSuccess()){ + log.info(formId+"提交失败!"+data); + } + log.info(formId+"提交成功!"+data); + return resultBean1; + } /** * 调用金蝶接口的数据格式 */ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 6e2bbf24ef..f1417949d6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -340,7 +340,7 @@ public class BdMaterialService extends FinKingDeeService { } /** - * 判断是否存在物料 + * 反审核 * @param bdMaterial * @return * @throws Exception 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 2beddc3337..d6eb9a0645 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; +import com.yxt.anrui.fin.api.kingdee.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; @@ -35,36 +36,68 @@ public class StkTransferDirectService extends FinKingDeeService { 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, - KingDeeBillUrl.VIEW_URL.getURL()); - log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); - JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString()); - JSONObject result = (JSONObject)jsonObject.get("Result"); - JSONObject result2 = (JSONObject)result.get("Result"); - log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); - log.info("result2:{}",result2); + JSONObject result2 = getMaterial(f); if(result2==null){ return rb.setMsg(f.getFMaterialId()+"物料不存在"); } - JSONArray materialStocks = (JSONArray)result2.get("MaterialStock"); - JSONObject materialStock = (JSONObject)materialStocks.get(0); - boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage"); - if(!IsBatchManage){//未开启批号管理 - f.setFLot("");//批号 - f.setFDestLot("");//调入批号 - }else{//开启批号管理 - f.setFLot(f.getFMaterialId());//批号 - f.setFDestLot(f.getFMaterialId());//调入批号 - } + setFlot(f, result2); } //准备 物料列表的数据 ForEntryBill List> vehicleListMap = createVehicleLists(fBillEntry); String kingDeeData = StkTransferDirectCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); - return accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + /*{"Result":{"ResponseStatus":{"IsSuccess":true,"Errors":[],"SuccessEntitys":[{"Id":102499,"Number":"","DIndex":0}],"SuccessMessages":[],"MsgCode":0},"Id":102499,"Number":"","NeedReturnData":[{}]}}*/ + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + String data = stringResultBean.getData(); + JSONObject jsonObject = JSONObject.parseObject(data.toString()); + JSONObject result = (JSONObject)jsonObject.get("Result"); + JSONObject result2 = (JSONObject)result.get("Result"); + log.info("StkTransferDirect:{}",data); + log.info("result2:{}",result2); + String id = (String)result.get("id"); + ResultBean submit = submit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID()); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); + ResultBean audit = audit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID()); + if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); + return stringResultBean; } catch (Exception e) { e.printStackTrace(); } - return rb; + return rb.setMsg("调拨单推送失败!"); + } + /** + * 设置批号 + * @param f + * @param result2 + */ + private void setFlot(StkTransferDirect.FBillEntry f, JSONObject result2) { + JSONArray materialStocks = (JSONArray) result2.get("MaterialStock"); + JSONObject materialStock = (JSONObject)materialStocks.get(0); + boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage"); + if(!IsBatchManage){//未开启批号管理 + f.setFLot("");//批号 + f.setFDestLot("");//调入批号 + }else{//开启批号管理 + f.setFLot(f.getFMaterialId());//批号 + f.setFDestLot(f.getFMaterialId());//调入批号 + } + } + + /** + * 查询物料 + * @param f + * @return + * @throws Exception + */ + private JSONObject getMaterial(StkTransferDirect.FBillEntry f) throws Exception { + String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_MATERIAL.getID(), f.getFMaterialId()); + ResultBean kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(), getKDForNumbers, + KingDeeBillUrl.VIEW_URL.getURL()); + log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); + JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString()); + JSONObject result = (JSONObject)jsonObject.get("Result"); + JSONObject result2 = (JSONObject)result.get("Result"); + log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); + log.info("result2:{}",result2); + return result2; } } From bcc6346e3468a6d6764f254c60394b53dd493acb Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 22 Oct 2022 16:34:26 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemanufacturer/BaseManufacturerFeignFallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index 106151e4b7..c08961fd30 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java @@ -117,7 +117,7 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { } @Override - public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { + public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { return null; }