From 7878a5bdd0218d386a10ac1aad99bb2c3ee0d919 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 14 Feb 2023 09:18:53 +0800 Subject: [PATCH] =?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 --- .../BaseAnnouncementmodel.java | 4 + .../BaseAnnouncementmodelDetailsVo.java | 4 + .../BaseAnnouncementmodelDto.java | 4 + .../BaseAnnouncementmodelVo.java | 2 + .../BaseAnnouncementmodelParam.java | 10 + .../BaseAnnouncementmodelParamDetailsVo.java | 10 + .../BaseAnnouncementmodelParamDto.java | 10 + .../BaseAnnouncementmodelParamVo.java | 8 + .../base/api/basevehicle/BaseVehicleDto.java | 5 + .../api/basevehicle/BaseVehicleFeign.java | 2 +- .../BaseAccadjApplyService.java | 91 ++++---- .../biz/basetrailer/BaseTrailerMapper.java | 2 +- .../base/biz/basevehicle/BaseVehicleRest.java | 196 ++++++++++++++---- .../biz/basevehicle/BaseVehicleService.java | 1 - .../sysorganization/SysOrganizationFeign.java | 5 + .../sysorganization/SysOrganizationRest.java | 7 + .../scmapplyinbound/ScmApplyInboundVo.java | 3 + .../ScmApplyInboundQuery.java | 2 + .../ScmApplyInboundQueryDetailsVo.java | 2 + .../ScmApplyInboundQueryDto.java | 2 + .../ScmApplyInboundQueryFeign.java | 2 +- .../ScmApplyInboundService.java | 45 +--- .../ScmApplyInboundQueryRest.java | 2 +- .../ScmApplyInboundQueryService.java | 56 ++--- .../ScmVehicleEnterlibraryService.java | 45 +--- 25 files changed, 300 insertions(+), 220 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodel.java index 8662a1c64f..0fd05617e3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodel.java @@ -52,6 +52,10 @@ public class BaseAnnouncementmodel extends BaseEntity { @ApiModelProperty("公告型号名称") private String announcementmodelName; // 公告型号名称 + @ApiModelProperty("车辆名称key") + private String vehNameKey; // 车辆名称key + @ApiModelProperty("车辆名称value") + private String vehNameValue; // 车辆名称value @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDetailsVo.java index 3b8983eb92..be340c757b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDetailsVo.java @@ -57,6 +57,10 @@ public class BaseAnnouncementmodelDetailsVo implements Vo { @ApiModelProperty("公告型号名称") private String announcementmodelName; // 公告型号名称 + @ApiModelProperty("车辆名称key") + private String vehNameKey; // 车辆名称key + @ApiModelProperty("车辆名称value") + private String vehNameValue; // 车辆名称value @ApiModelProperty("备注") private String remarks; // 备注 @ApiModelProperty("使用组织sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDto.java index 7bd2a218c1..3b7d7e4a15 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDto.java @@ -56,6 +56,10 @@ public class BaseAnnouncementmodelDto implements Dto { @ApiModelProperty("公告型号名称") private String announcementmodelName; // 公告型号名称 + @ApiModelProperty("车辆名称key") + private String vehNameKey; // 车辆名称key + @ApiModelProperty("车辆名称value") + private String vehNameValue; // 车辆名称value @ApiModelProperty("备注") private String remarks; // 备注 @ApiModelProperty("申请人sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelVo.java index bebe870f3c..3e03371098 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelVo.java @@ -53,6 +53,8 @@ public class BaseAnnouncementmodelVo implements Vo { @ApiModelProperty("公告型号名称") private String announcementmodelName; // 公告型号名称 + @ApiModelProperty("车辆名称value") + private String vehNameValue; // 车辆名称value @ApiModelProperty("备注") private String remarks; // 备注 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParam.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParam.java index 5d5bf879e8..c927af83ac 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParam.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParam.java @@ -66,4 +66,14 @@ public class BaseAnnouncementmodelParam extends BaseEntity { private String tyreValue; // 轮胎Value @ApiModelProperty("整车外观尺寸") private String vehAppeSize; // 整车外观尺寸 + @ApiModelProperty("货箱内部尺寸") + private String boxInsideSize; // 货箱内部尺寸 + @ApiModelProperty("额定载质量（Kg）") + private String ratedLoadQuality; // 额定载质量（Kg） + @ApiModelProperty("轴距key") + private String wheelbaseKey; // 轴距key + @ApiModelProperty("轴距value") + private String wheelbaseValue; // 轴距value + @ApiModelProperty("货厢底板到仓栅顶部高（mm）") + private String boxFloorReaGraTopHigh; // 货厢底板到仓栅顶部高（mm） } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDetailsVo.java index 83aa3f5334..c3cfd5a570 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDetailsVo.java @@ -67,4 +67,14 @@ public class BaseAnnouncementmodelParamDetailsVo implements Vo { private String tyreValue; // 轮胎Value @ApiModelProperty("整车外观尺寸") private String vehAppeSize; // 整车外观尺寸 + @ApiModelProperty("货箱内部尺寸") + private String boxInsideSize; // 货箱内部尺寸 + @ApiModelProperty("额定载质量（Kg）") + private String ratedLoadQuality; // 额定载质量（Kg） + @ApiModelProperty("轴距key") + private String wheelbaseKey; // 轴距key + @ApiModelProperty("轴距value") + private String wheelbaseValue; // 轴距value + @ApiModelProperty("货厢底板到仓栅顶部高（mm）") + private String boxFloorReaGraTopHigh; // 货厢底板到仓栅顶部高（mm） } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDto.java index c50bfce35d..ab3f1c00b1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDto.java @@ -67,4 +67,14 @@ public class BaseAnnouncementmodelParamDto implements Dto { private String tyreValue; // 轮胎Value @ApiModelProperty("整车外观尺寸") private String vehAppeSize; // 整车外观尺寸 + @ApiModelProperty("货箱内部尺寸") + private String boxInsideSize; // 货箱内部尺寸 + @ApiModelProperty("额定载质量（Kg）") + private String ratedLoadQuality; // 额定载质量（Kg） + @ApiModelProperty("轴距key") + private String wheelbaseKey; // 轴距key + @ApiModelProperty("轴距value") + private String wheelbaseValue; // 轴距value + @ApiModelProperty("货厢底板到仓栅顶部高（mm）") + private String boxFloorReaGraTopHigh; // 货厢底板到仓栅顶部高（mm） } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamVo.java index 82b89cb23e..519642993d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamVo.java @@ -67,4 +67,12 @@ public class BaseAnnouncementmodelParamVo implements Vo { private String tyreValue; // 轮胎Value @ApiModelProperty("整车外观尺寸") private String vehAppeSize; // 整车外观尺寸 + @ApiModelProperty("货箱内部尺寸") + private String boxInsideSize; // 货箱内部尺寸 + @ApiModelProperty("额定载质量（Kg）") + private String ratedLoadQuality; // 额定载质量（Kg） + @ApiModelProperty("轴距value") + private String wheelbaseValue; // 轴距value + @ApiModelProperty("货厢底板到仓栅顶部高（mm）") + private String boxFloorReaGraTopHigh; // 货厢底板到仓栅顶部高（mm） } 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 dfafaa1d32..cf65f4e059 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 @@ -151,4 +151,9 @@ public class BaseVehicleDto implements Dto { private String supplierCode; @ApiModelProperty(value = "分公司code") private String orgCode; + + @ApiModelProperty(value = "入库sid") + private String inBoundSid; + @ApiModelProperty(value = "外采sid") + private String outSourcSid; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 20ad6f7769..c1b7d2f589 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -48,7 +48,7 @@ public interface BaseVehicleFeign { */ @ApiOperation("车辆信息分页列表") @PostMapping("/pagerList") - public ResultBean> pagerList(@RequestBody PagerQuery pq); + public ResultBean> pagerList(@RequestBody PagerQuery pq); /** * 按照组织层级分页查询 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 a438e34c1b..28c2562e3f 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 @@ -75,6 +75,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -193,9 +194,9 @@ public class BaseAccadjApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); if (!userVoResultBean.getSuccess()) { @@ -576,6 +577,7 @@ public class BaseAccadjApplyService extends MybatisBaseService data1 = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(baseAccadjApply.getCallOutOrgSid()).getData(); - if (data1 != null){ + if (data1 != null) { for (BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo : data1) { BdSupplier bdSupplier = new BdSupplier(); ResultBean sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); @@ -624,7 +626,7 @@ public class BaseAccadjApplyService extends MybatisBaseService sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); SysOrganizationVo vo = sysOrganizationVoResultBean1.getData(); @@ -647,10 +649,10 @@ public class BaseAccadjApplyService extends MybatisBaseService stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(), baseAccadjApply.getCallOutOrgSid()); List baseAccadjApplyToJDRus = new ArrayList<>(); for (String s : stringList) { @@ -660,65 +662,45 @@ public class BaseAccadjApplyService extends MybatisBaseService baseVehicles = accadjApplyToJDRus.getBaseVehicles(); //单据编号 salOutStock.setFBillNo(baseAccadjApply.getApplyNo()); //日期:FDate (必填项) salOutStock.setFDate(DateUtil.today()); - //项目类别:F_PAEZ_Assistant (必填项) 集团内部调车 034 salOutStock.setF_PAEZ_AssistantKey("034"); salOutStock.setF_PAEZ_AssistantType("payType"); + //调出销售部门编码 + String purchaseSystemCode = baseVehicles.get(0).getPurchaseSystemCode(); + //调出采购系统sid(部门sid) + String purchaseSystemSid = baseVehicles.get(0).getPurchaseSystemSid(); + //调出获取采购系统 + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); + //调出获取采购系统中的财务分公司编码 + String orgCode = basePurchaseSystemDetailsVo.getOrgCode(); + BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicles.get(0).getVinNo(), baseAccadjApply.getCallInOrgSid()); + //调入采购系统sid(部门sid) + String purchaseSystemSidDR = baseVehicleDR.getPurchaseSystemSid(); + //调入获取采购系统 + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVoDR = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSidDR).getData(); + //调入获取采购系统中的财务分公司编码 + String orgCodeDR = basePurchaseSystemDetailsVoDR.getOrgCode(); + //调入根据code获取组织信息 + SysOrganization sysOrganization = sysOrganizationFeign.selectByOrgCode(orgCodeDR).getData(); + //调入获取组织的otherCode + String otherCode = sysOrganization.getOtherCode(); //销售部门:FSaleDeptID (必填项) - //销售部门id - ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseAccadjApply.getCallOutOrgSid(), "销售支持部"); - SysOrganizationVo vo = new SysOrganizationVo(); - if (resultBean1.getSuccess()) { - vo = resultBean1.getData(); - if (vo != null) { - salOutStock.setFSaleDeptID(vo.getOrgCode()); - //salOutStock.setFSaleDeptID("05.04"); - } - } + salOutStock.setFSaleDeptID(purchaseSystemCode); //销售组织:FSaleOrgId (必填项) //分公司id - BasePurchaseSystemDetailsVo data1 = basePurchaseSystemService.fetchDetailsByDeptSid(vo.getSid()).getData(); - if (data1 != null) { - salOutStock.setFSaleOrgId(data1.getOrgCode()); - } else { - ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()); - if (resultBean.getSuccess()) { - SysOrganizationVo vo1 = resultBean.getData(); - if (vo1 != null) { - salOutStock.setFSaleOrgId(vo.getOrgCode()); - } - } - } + //判断采购系统对应的财务分公司code + salOutStock.setFSaleOrgId(orgCode); //客户:FCustomerID (必填项) - String callInOrgSid = baseAccadjApply.getCallInOrgSid(); - SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData(); - salOutStock.setFCustomerID(data.getOtherCode()); - //salOutStock.setFCustomerID(" JXYXB"); - //发货组织:FStockOrgId (必填项) - //salOutStock.setFStockOrgId("101"); + salOutStock.setFCustomerID(otherCode); List fEntity = new ArrayList<>(); - List bdCustomers = new ArrayList<>(); for (BaseVehicle baseVehicle : baseVehicles) { - //推送财务客户信息 - BdCustomer bdCustomer = new BdCustomer(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(callInOrgSid).getData(); - bdCustomer.setTOrgIds(sysOrganizationVo.getOtherCode()); - bdCustomer.setFName(sysOrganizationVo.getName() + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); - String FNumber1 = HanZiConverterPinYin.getPinYinFirst(sysOrganizationVo.getName()) + baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8); - if (FNumber1.length() > 30) { - FNumber1 = FNumber1.substring(0, 30); - bdCustomer.setFNumber(FNumber1); - } else { - bdCustomer.setFNumber(FNumber1); - } - bdCustomers.add(bdCustomer); //销售出库单物料信息 SalOutStock.FEntity fe = new SalOutStock.FEntity(); //单价:FPrice @@ -747,6 +729,13 @@ public class BaseAccadjApplyService extends MybatisBaseService bdCustomers = new ArrayList<>(); + BdCustomer bdCustomer = new BdCustomer(); + bdCustomer.setTOrgIds(salOutStock.getFSaleOrgId()); + bdCustomer.setFName(baseAccadjApply.getCallInOrgName()); + bdCustomer.setFNumber(salOutStock.getFCustomerID()); + bdCustomers.add(bdCustomer); finKingDeeFeign.draftBdCustomers(bdCustomers); } return salOutStock; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index 586ae86562..ca096c64ed 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -82,7 +82,7 @@ public interface BaseTrailerMapper extends BaseMapper { */ IPage searchPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from base_trailer where vehSid = #{sid}") + @Select("select * from base_trailer where vehSid = #{sid} limit 1") BaseTrailerDetailsVo fetchByVehSid(String sid); String selectNum(String billNo); 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 a53f8ef1bf..28e66388f1 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 @@ -6,10 +6,13 @@ import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; 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.BaseManufacturerDetailsVo; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; +import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; @@ -23,6 +26,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; @@ -47,6 +51,14 @@ import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeign; +import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; +import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto; +import com.yxt.anrui.scm.api.scminbound.ScmInboundFeign; +import com.yxt.anrui.scm.api.scminbounddetail.ScmInboundDetailFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; @@ -98,41 +110,34 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Autowired private BaseVehicleService baseVehicleService; - @Autowired private HttpServletResponse response; - @Autowired private BaseVehicleModelService baseVehicleModelService; - @Autowired private BaseVehicleBrandService baseVehicleBrandService; - @Autowired private BaseModelConfigService baseModelConfigService; - @Autowired private BusVehicleInquiryService busVehicleInquiryService; - @Autowired private BaseVehicleCertificateService baseVehicleCertificateService; - @Autowired private BaseVehmodelConfigService baseVehmodelConfigService; + @Autowired + private BaseOutsourcingApplicationService baseOutsourcingApplicationService; + @Autowired + private ScmApplyInboundFeign scmApplyInboundFeign; + @Autowired + private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign; /** * 财务模块中的金蝶接口 */ @Autowired - private FinKingDeeFeign finKingDeeFeign; - @Autowired private BaseVehicleTempstateService baseVehicleTempstateService; @Autowired private SysOrganizationFeign sysOrganizationFeign; @Autowired - private BaseOutsourcingApplicationService baseOutsourcingApplicationService; - @Autowired - private SysUserFeign sysUserFeign; - @Autowired private BaseManufacturerService baseManufacturerService; @Autowired private BaseManufacturerBankService baseManufacturerBankService; @@ -428,19 +433,120 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode())) baseVehicleService.saveVeh_tc(baseVehicle); } - if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()) - || eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { - kingdeeStkInStock(dto); + String cgrkdSid = ""; + if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { + cgrkdSid = pushRZInBoundQuery(dto); + } else if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())) { + cgrkdSid = pushWCInBoundQuery(dto); } + scmApplyInboundQueryFeign.ctcgykd(cgrkdSid); return rb.success().setMsg("保存成功"); } + /* + * 入库推送业务采购入库单查询 + * */ + private String pushRZInBoundQuery(List dto) { + //推送车辆入库查询 + ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); + BaseVehicleDto baseVehicleDto = dto.get(0); + ScmApplyInboundVo scmApplyInboundVo = scmApplyInboundFeign.fetchSid(baseVehicleDto.getInBoundSid()).getData(); + scmApplyInboundQueryDto.setOrgPriceDate(baseVehicleDto.getOrgPriceDate()); + scmApplyInboundQueryDto.setManPurOrderTypeKey(baseVehicleDto.getManPurOrderTypeKey()); + scmApplyInboundQueryDto.setManPurOrderTypeValue(baseVehicleDto.getManPurOrderTypeValue()); + scmApplyInboundQueryDto.setApplicationCode(scmApplyInboundVo.getApplicationCode()); + scmApplyInboundQueryDto.setOrgDeptSid(scmApplyInboundVo.getOrgSid()); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(scmApplyInboundVo.getOrgSid()).getData(); + scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); + scmApplyInboundQueryDto.setPurchaseSystemCode(baseVehicleDto.getOrgCode()); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicleDto.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setPurchaseSystemName(baseVehicleDto.getPurchaseSystemName()); + scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); + scmApplyInboundQueryDto.setManSid(baseVehicleDto.getSupplierSid()); + scmApplyInboundQueryDto.setManName(baseVehicleDto.getSupplierName()); + scmApplyInboundQueryDto.setManCode(baseVehicleDto.getSupplierCode()); + scmApplyInboundQueryDto.setMakeListSid(scmApplyInboundVo.getApplicationSid()); + scmApplyInboundQueryDto.setMakeListName(scmApplyInboundVo.getApplicationName()); + scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); + scmApplyInboundQueryDto.setCreateOrgSid(scmApplyInboundVo.getUseOrgSid()); + scmApplyInboundQueryDto.setCreateOrgName(scmApplyInboundVo.getUseOrgName()); + scmApplyInboundQueryDto.setBusSid(scmApplyInboundVo.getSid()); + List scmApplyInboundVehQuerys = new ArrayList<>(); + for (BaseVehicleDto baseVehicleDto1 : dto) { + ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); + scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); + scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData(); + scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType()); + scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); + scmApplyInboundVehQueryDto.setIunit("辆"); + scmApplyInboundVehQueryDto.setNum("1"); + scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice())); + scmApplyInboundVehQueryDto.setLocalName("在途仓库"); + scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); + scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); + } + scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); + String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); + return sid; + } + + /* + * 外采收车推送业务采购入库单查询 + * */ + private String pushWCInBoundQuery(List dto) { + //推送车辆入库查询 + ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); + BaseVehicleDto baseVehicleDto = dto.get(0); + BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.fetchBySid(baseVehicleDto.getOutSourcSid()); + scmApplyInboundQueryDto.setOrgPriceDate(baseVehicleDto.getOrgPriceDate()); + scmApplyInboundQueryDto.setManPurOrderTypeKey(baseVehicleDto.getManPurOrderTypeKey()); + scmApplyInboundQueryDto.setManPurOrderTypeValue(baseVehicleDto.getManPurOrderTypeValue()); + scmApplyInboundQueryDto.setApplicationCode(baseOutsourcingApplication.getApplicationCode()); + scmApplyInboundQueryDto.setOrgDeptSid(baseOutsourcingApplication.getOrgSid()); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(baseOutsourcingApplication.getOrgSid()).getData(); + scmApplyInboundQueryDto.setOrgDeptName(sysOrganizationVoBM.getName()); + scmApplyInboundQueryDto.setPurchaseSystemCode(baseVehicleDto.getOrgCode()); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicleDto.getPurchaseSystemSid()).getData(); + scmApplyInboundQueryDto.setPurchaseSystemName(baseVehicleDto.getPurchaseSystemName()); + scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo.getOrgCode()); + scmApplyInboundQueryDto.setManSid(baseVehicleDto.getSupplierSid()); + scmApplyInboundQueryDto.setManName(baseVehicleDto.getSupplierName()); + scmApplyInboundQueryDto.setManCode(baseVehicleDto.getSupplierCode()); + scmApplyInboundQueryDto.setMakeListSid(baseOutsourcingApplication.getCreateBySid()); + scmApplyInboundQueryDto.setMakeListName(baseOutsourcingApplication.getCreateByName()); + scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); + scmApplyInboundQueryDto.setCreateOrgSid(baseOutsourcingApplication.getUseOrgSid()); + scmApplyInboundQueryDto.setCreateOrgName(baseOutsourcingApplication.getUseOrgName()); + scmApplyInboundQueryDto.setBusSid(baseOutsourcingApplication.getSid()); + List scmApplyInboundVehQuerys = new ArrayList<>(); + for (BaseVehicleDto baseVehicleDto1 : dto) { + ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo()); + scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode()); + scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName()); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData(); + scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType()); + scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); + scmApplyInboundVehQueryDto.setIunit("辆"); + scmApplyInboundVehQueryDto.setNum("1"); + scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice())); + scmApplyInboundVehQueryDto.setLocalName("在途仓库"); + scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); + scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); + } + scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); + String sid = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto).getData(); + return sid; + } + /** * 推送金蝶采购入库单 * * @param dto */ - private void kingdeeStkInStock(List dto) { + /*private void kingdeeStkInStock(List dto) { try { StkInStock stkInStock = new StkInStock(); BaseVehicleDto baseVehicle = dto.get(0); @@ -457,7 +563,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { 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) { @@ -466,8 +572,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(); @@ -496,45 +602,45 @@ public class BaseVehicleRest implements BaseVehicleFeign { //车型品牌对应厂商生成的分公司的主机厂供应商编码 String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); stkInStock.setFSupplierId(manCode); - }*/ - /** + }*//* + *//** * // 入库日期:FDate (必填项) - */ - stkInStock.setFDate(baseVehicle.getOrgPriceDate()); + *//* + stkInStock.setFDate(baseVehicle.getPriceDate()); - /** + *//** * // 物料列表:FInStockEntry (必填项) - */ + *//* List fInStockEntry = new ArrayList<>(); //直接调拨单的物料列表 List FPAYBILLENTRYs = 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()); - }*/ - /** + }*//* + *//** * 单价 对应厂家结算价 - */ + *//* sf.setFPrice(baseVehicleDto.getCostPrice() + ""); - /** + *//** * 车辆类型 - */ + *//* //厂家采购 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"); @@ -549,20 +655,20 @@ public class BaseVehicleRest implements BaseVehicleFeign { sf.setFCategoryIDType("purchaseOrderType"); sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey()); - /** + *//** * // 批号:FLot - */ + *//* sf.setFLot(baseVehicleDto.getVinNo()); - /** + *//** * // 物料编码:FMaterialId (必填项) - */ + *//* sf.setFMaterialId(baseVehicleDto.getVinNo().substring(baseVehicleDto.getVinNo().length() - 8)); - /** + *//** * // 仓库:FStockId-目前只分在途和正式两个仓库。 - */ + *//* //仓库编码 sf.setFStockId("ARZSCK"); - /*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { + *//*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 sf.setFStockId("ARZTCK"); } else { @@ -571,7 +677,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); sf.setFStockId(data.getGressionCode()); } - }*/ + }*//* fInStockEntry.add(sf); //填充直接调拨单物料列表数据 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); @@ -593,7 +699,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } catch (Exception e) { e.printStackTrace(); } - } + }*/ /*** * 只是更新验车推送数据作用，验车推送需要更新的字段属性 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 ac713da928..97055abdda 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 @@ -2457,7 +2457,6 @@ public class BaseVehicleService extends MybatisBaseService selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); + + @GetMapping("/selectByOrgCode") + @ResponseBody + @ApiOperation("根据code查询组织信息") + ResultBean selectByOrgCode(@RequestParam("orgCode") String orgCode); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 64b8da6da6..1ebd5386f7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -436,4 +436,11 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean selectByOrgSidPath(String orgSidPath) { return sysOrganizationService.selectByOrgSidPath(orgSidPath); } + + @Override + public ResultBean selectByOrgCode(String orgCode) { + ResultBean rb = ResultBean.fireFail(); + SysOrganization sysOrganization = sysOrganizationService.selectByOrgCode(orgCode); + return rb.success().setData(sysOrganization); + } } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 766b9cb901..9bc6f30805 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -160,4 +160,7 @@ public class ScmApplyInboundVo implements Vo { @ApiModelProperty("配置sid") private String configSid; + @ApiModelProperty("部门sid") + private String orgSid; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java index 200449d7c7..222f7b5535 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQuery.java @@ -64,6 +64,8 @@ public class ScmApplyInboundQuery extends BaseEntity { private String orgDeptName; // 部门名称 @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("采购系统编码") + private String purchaseSystemCode; // 采购系统编码 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 @ApiModelProperty("供应商sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java index 9151e38e54..58b3917a62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java @@ -69,6 +69,8 @@ public class ScmApplyInboundQueryDetailsVo implements Vo { private String orgDeptName; // 部门名称 @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("采购系统编码") + private String purchaseSystemCode; // 采购系统编码 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 @ApiModelProperty("供应商sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java index a31da74d45..ee2fa755aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDto.java @@ -68,6 +68,8 @@ public class ScmApplyInboundQueryDto implements Dto { private String orgDeptName; // 部门名称 @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 + @ApiModelProperty("采购系统编码") + private String purchaseSystemCode; // 采购系统编码 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 @ApiModelProperty("供应商sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java index e56d747a62..9be8373c73 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java @@ -64,7 +64,7 @@ public interface ScmApplyInboundQueryFeign { @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto); + public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 01895e431f..d4dd12020c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -545,50 +545,6 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehQuerys = new ArrayList<>(); - for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) { - ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); - scmApplyInboundVehQueryDto.setVinNo(scmApplyInboundVehicleDto.getVinNo()); - BaseVehicleSelectVo data4 = baseVehicleFeign.details(scmApplyInboundVehicleDto.getSid()).getData(); - BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data4.getCarBrandSid()); - scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode()); - scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName()); - BaseVehicleModel data5 = baseVehicleModelFeign.selectDetails(data4.getModelSid()).getData(); - scmApplyInboundVehQueryDto.setVehicleTypeKey(data5.getVehicleType()); - scmApplyInboundVehQueryDto.setVehicleTypeValue(data5.getVehicleTypeValue()); - scmApplyInboundVehQueryDto.setIunit("辆"); - scmApplyInboundVehQueryDto.setNum("1"); - scmApplyInboundVehQueryDto.setSettleMoney(booad.getCostPrice().toString()); - scmApplyInboundVehQueryDto.setLocalName("在途仓库"); - scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); - scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); - } - scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); - scmApplyInboundQueryService.saveOrUpdateDto(scmApplyInboundQueryDto); //入账审批通关修改采购订单状态 state = 1 if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) { busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid()); @@ -705,6 +661,7 @@ 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/scmapplyinboundquery/ScmApplyInboundQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java index fe36ebcebe..2d6e61267a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java @@ -69,7 +69,7 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign { @Override @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto){ + public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto){ ResultBean rb = ResultBean.fireFail(); scmApplyInboundQueryService.saveOrUpdateDto(dto); return rb.success(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java index e5dd318c5f..224cf5ee84 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java @@ -132,7 +132,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService createPdf(String cgrkdSid,String printerType) { + public ResultBean createPdf(String cgrkdSid, String printerType) { ResultBean rb = ResultBean.fireFail(); PdfPath pdfPath = new PdfPath(); //获取车辆入库单查询 @@ -231,9 +232,9 @@ public class ScmApplyInboundQueryService extends MybatisBaseService scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); - List baseVehicles = new ArrayList<>(); - for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { - BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(scmApplyInboundVehQueryDetailsVo.getVinNo(), scmApplyInboundQuery.getCreateOrgSid()).getData(); - baseVehicles.add(baseVehicle); - } try { StkInStock stkInStock = new StkInStock(); - BaseVehicle baseVehicle = baseVehicles.get(0); - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); - //获取采购系统中的财务编码 - if (basePurchaseSystemDetailsVo != null) { - stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode()); - stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode()); - } else { - stkInStock.setFPurchaseOrgId(baseVehicle.getOrgCode()); - stkInStock.setTOrgId(baseVehicle.getOrgCode()); - } - stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode()); - stkInStock.setFSupplierId(baseVehicle.getSupplierCode()); + //获取查询中财务分公司编码 + String orgCode = scmApplyInboundQuery.getOrgCode(); + stkInStock.setFPurchaseOrgId(orgCode); + stkInStock.setTOrgId(orgCode); + stkInStock.setFPurchaseDeptId(scmApplyInboundQuery.getPurchaseSystemCode()); + stkInStock.setFSupplierId(scmApplyInboundQuery.getManCode()); // 入库日期:FDate (必填项) - stkInStock.setFDate(baseVehicle.getOrgPriceDate()); + stkInStock.setFDate(scmApplyInboundQuery.getOrgPriceDate()); // 物料列表:FInStockEntry (必填项) List fInStockEntry = new ArrayList<>(); //直接调拨单的物料列表 List FPAYBILLENTRYs = new ArrayList<>(); - for (BaseVehicle baseVehicleDto : baseVehicles) { + for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); - sf.setWlfz(baseVehicleDto.getCarBrandCode()); + sf.setWlfz(scmApplyInboundVehQueryDetailsVo.getMgroupCode()); //单价 对应厂家结算价 - sf.setFPrice(baseVehicleDto.getCostPrice() + ""); + sf.setFPrice(scmApplyInboundVehQueryDetailsVo.getSettleMoney() + ""); //车辆类型 //厂家采购 - if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || - ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { + if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey()) || + ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) { //车辆类型-厂家外采和调车 - sf.setCllx(baseVehicleDto.getManufSaleAccessKey()); + sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue()); sf.setCllxType("sellChannel"); - } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { + } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) { //车辆类型-外采主车 sf.setCllx("60"); sf.setCllxType("sellChannel"); @@ -295,11 +285,11 @@ public class ScmApplyInboundQueryService extends MybatisBaseService list = new ArrayList<>(); list.add(baseVehicleDto); baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode()); - //推送车辆入库查询 - ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto(); - scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date())); - scmApplyInboundQueryDto.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.WC_ORDER.getCode()); - scmApplyInboundQueryDto.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks()); - BaseOutsourcingApplicationDetailsVo data6 = baseOutsourcingApplicationFeign.fetchBySid(scmVehicleEnterlibrary.getBusinessSid()).getData(); - scmApplyInboundQueryDto.setApplicationCode(data6.getApplicationCode()); - scmApplyInboundQueryDto.setOrgDeptSid(data6.getPurchaseSystemSid()); - SysOrganizationVo data7 = sysOrganizationFeign.fetchBySid(data6.getPurchaseSystemSid()).getData(); - scmApplyInboundQueryDto.setOrgDeptName(data7.getName()); - BasePurchaseSystemDetailsVo data1 = basePurchaseSystemFeign.fetchDetailsByDeptSid(data6.getPurchaseSystemSid()).getData(); - scmApplyInboundQueryDto.setPurchaseSystemName(data1.getPurchaseSystemName()); - scmApplyInboundQueryDto.setOrgCode(data1.getOrgCode()); - BaseManufacturerDetailsVo data2 = baseManufacturerFeign.fetchByCode(data6.getSupplierCode()).getData(); - scmApplyInboundQueryDto.setManSid(data2.getSid()); - scmApplyInboundQueryDto.setManName(data2.getManufacturerName()); - scmApplyInboundQueryDto.setManCode(data2.getManufacturerCode()); - scmApplyInboundQueryDto.setMakeListSid(dto.getUserSid()); - SysUserVo data3 = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); - scmApplyInboundQueryDto.setMakeListName(data3.getName()); - scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date())); - scmApplyInboundQueryDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); - scmApplyInboundQueryDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName()); - scmApplyInboundQueryDto.setBusSid(data6.getSid()); - List scmApplyInboundVehQuerys = new ArrayList<>(); - ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); - scmApplyInboundVehQueryDto.setVinNo(scmVehicleEnterlibrary.getVinNo()); - scmApplyInboundVehQueryDto.setMgroupCode("99.01"); - scmApplyInboundVehQueryDto.setMgroupName("外采主车"); - BaseVehicleModel data5 = baseVehicleModelFeign.selectDetails(data6.getModelSid()).getData(); - scmApplyInboundVehQueryDto.setVehicleTypeKey(data5.getVehicleType()); - scmApplyInboundVehQueryDto.setVehicleTypeValue(data5.getVehicleTypeValue()); - scmApplyInboundVehQueryDto.setIunit("辆"); - scmApplyInboundVehQueryDto.setNum("1"); - scmApplyInboundVehQueryDto.setSettleMoney(data6.getGuidedPrice()); - scmApplyInboundVehQueryDto.setLocalName("在途仓库"); - scmApplyInboundVehQueryDto.setLocalCode("ARZTCK"); - scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto); - scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys); - scmApplyInboundQueryService.saveOrUpdateDto(scmApplyInboundQueryDto); } // 调车 if (ManPurOrderType.ManOrderType.NG_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { @@ -627,7 +587,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService