From 8aeb6a6a726617cbbd37592c38247805ca30f273 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Feb 2023 17:30:42 +0800 Subject: [PATCH 1/2] =?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 --- .../portal/biz/sysuser/SysUserService.java | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 34aa2ed592..38ec782cda 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -387,9 +387,24 @@ public class SysUserService extends MybatisBaseService { //根据用户sid查询用户是否设置了默认的组织机构 SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid()); if (sysUserDefaultOrg == null) { + String orgNamePath = ""; userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath()); - userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); + if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) { + List split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2)); + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); + orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); + } else { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); + orgNamePath = sysOrganization.getName(); + } + } +// userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); + userInfoOneVo.setDefaultOrgPathName(orgNamePath); } else { + String orgNamePath = ""; List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid()); sysStaffOrgVos.removeAll(Collections.singleton(null)); List orgSidPathList = sysStaffOrgVos.stream().map(v -> v.getOrgSidPath()).collect(Collectors.toList()); @@ -397,7 +412,19 @@ public class SysUserService extends MybatisBaseService { sysUserDefaultOrgService.deleteByUserSid(user.getSid()); } userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath()); - userInfoOneVo.setDefaultOrgPathName(sysUserDefaultOrg.getOrgNamePath()); + if (StringUtils.isNotBlank(sysUserDefaultOrg.getOrgSidPath())) { + List split = Arrays.asList(sysUserDefaultOrg.getOrgSidPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size() - 2)); + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size() - 1)); + orgNamePath = sysOrganization.getName() + "/" + sysOrganization1.getName(); + } else { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); + orgNamePath = sysOrganization.getName(); + } + } + userInfoOneVo.setDefaultOrgPathName(orgNamePath); } } } @@ -416,7 +443,17 @@ public class SysUserService extends MybatisBaseService { orgList1.setOrgName(vv.getOrgNamePath()); String orgName = ""; if (StringUtils.isNotBlank(vv.getOrgSidPath())) { - String[] split = vv.getOrgSidPath().split("/"); + List split = Arrays.asList(vv.getOrgSidPath().split("/")); + if(split.size()>1){ + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2)); + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1)); + orgName = sysOrganization.getName()+"/"+sysOrganization1.getName(); + }else{ + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0)); + orgName = sysOrganization.getName(); + } + /*String[] split = vv.getOrgSidPath().split("/"); for (int i = 0; i < split.length; i++) { //获取本级sid获取本级部门信息 SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split[i]); @@ -429,7 +466,7 @@ public class SysUserService extends MybatisBaseService { orgName = orgName+"/"+bjName; } } - } + }*/ orgList1.setOrgName(orgName); } orgList.add(orgList1); From 7a0506ef24a797d54c59574c360938fac2f921e7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 3 Feb 2023 17:38:10 +0800 Subject: [PATCH 2/2] =?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/basetrailer/BaseTrailerFeign.java | 2 +- .../api/basevehicleout/BaseVehicleOut.java | 3 + .../BaseVehicleOutDetailsVo.java | 2 + .../api/basevehicleout/BaseVehicleOutDto.java | 2 + .../BaseAccadjApplyService.java | 2 + .../biz/basetrailer/BaseTrailerService.java | 2 +- .../basevehicleout/BaseVehicleOutService.java | 17 +- .../ScmApplyInboundQueryFeign.java | 7 +- .../ScmApplyInboundQueryFeignFallback.java | 8 +- .../ScmApplyInboundVehQuery.java | 2 + .../ScmApplyInboundVehQueryDetailsVo.java | 2 + .../ScmApplyInboundVehQueryDto.java | 2 + .../ScmApplyInboundService.java | 2 + .../ScmApplyInboundQueryRest.java | 9 +- .../ScmApplyInboundQueryService.java | 357 +++++++++++------- .../ScmVehicleEnterlibraryService.java | 1 + 16 files changed, 276 insertions(+), 144 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index a243511f6c..bdb2c5c153 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -115,5 +115,5 @@ public interface BaseTrailerFeign { @ApiOperation("挂车出库") @PostMapping("/trailerOut/{sid}") - public ResultBean trailerOut(@PathVariable("sid") String sid); + ResultBean trailerOut(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index 775f1bad60..f7cc155ba9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java @@ -110,4 +110,7 @@ public class BaseVehicleOut extends BaseEntity { private String billNo; // 单据编号 @ApiModelProperty("主表sid") private String mainSid; // 主表sid + + @ApiModelProperty("财务中客户编码") + private String cwCustomerNo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java index 5d24ec00f8..f8d8f2d1dc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -76,4 +76,6 @@ public class BaseVehicleOutDetailsVo implements Vo { @ApiModelProperty("单据编号") private String billNo; // 单据编号 + @ApiModelProperty("财务中客户编码") + private String cwCustomerNo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index b8f1d3babd..abe08fa2b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -99,4 +99,6 @@ public class BaseVehicleOutDto implements Dto { @ApiModelProperty("是否要修改客户") private String isUpdateOrInsertCrm; // 是否要修改客户 + @ApiModelProperty("财务中客户编码") + private String cwCustomerNo; } 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 d289d53cf6..237dca6f22 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 @@ -596,8 +596,10 @@ public class BaseAccadjApplyService extends MybatisBaseService scmApplyInboundVehQuerys = new ArrayList<>(); for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) { ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo()); BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), baseAccadjApply.getCallInOrgSid()); + scmApplyInboundVehQueryDto.setVehSid(baseVehicle1.getSid()); BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle1.getCarBrandSid()); scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode()); scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 47a5fd7689..a0715d9569 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -556,7 +556,7 @@ public class BaseTrailerService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 8e15256b2e..b7117bd73c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -91,15 +91,6 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { ResultBean rb = ResultBean.fireFail(); Boolean b = false; - /* List list = dto.getQueryList(); - List stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList()); - //根据sid查询出库的车辆是否符合出库条件（库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的，车辆才能出库、可以批量选择）、当选择的车辆不满足条件时，点击出库按钮时 - //应给出提示“xx车辆不满足出库条件”、则不能出库 - /* List count = baseMapper.selectCountBySid(stringList); - if (count.size() > 0) { - String vinNo = String.join(",", count); - return rb.setMsg(vinNo + "车辆不满足出库条件"); - }*/ String vinSid = dto.getVinSid(); BdCustomer bdCustomer = new BdCustomer(); String payTypeKey = ""; @@ -131,6 +122,7 @@ public class BaseVehicleOutService extends MybatisBaseService createPdf(@RequestParam("cgrkdSid") String cgrkdSid); + ResultBean createPdf(@RequestParam("cgrkdSid") String cgrkdSid,@RequestParam("printerType") String printerType); + + @ApiOperation("重推采购入库单") + @PostMapping("/ctcgykd") + @ResponseBody + ResultBean ctcgykd(@RequestParam("cgrkdSid") String cgrkdSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java index a7c98c8599..7c6d0bb593 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java @@ -29,6 +29,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -71,7 +72,12 @@ public class ScmApplyInboundQueryFeignFallback implements ScmApplyInboundQueryFe } @Override - public ResultBean createPdf(String cgrkdSid) { + public ResultBean createPdf(String cgrkdSid,String printerType) { + return null; + } + + @Override + public ResultBean ctcgykd(String cgrkdSid) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java index dbbdc43469..2eeefb10e4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java @@ -53,6 +53,8 @@ public class ScmApplyInboundVehQuery extends BaseEntity { @ApiModelProperty("主表sid") private String mainSid; // 主表sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid @ApiModelProperty("物料编号") private String vinNo; // 物料编号 @ApiModelProperty("物料分组code") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java index b2b559282f..1548a0a14e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java @@ -54,6 +54,8 @@ public class ScmApplyInboundVehQueryDetailsVo implements Vo { @ApiModelProperty("主表sid") private String mainSid; // 主表sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid @ApiModelProperty("物料编号") private String vinNo; // 物料编号 @ApiModelProperty("物料分组code") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java index 3fa87d3d52..b15b4031b1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java @@ -54,6 +54,8 @@ public class ScmApplyInboundVehQueryDto implements Dto { @ApiModelProperty("主表sid") private String mainSid; // 主表sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid @ApiModelProperty("物料编号") private String vinNo; // 物料编号 @ApiModelProperty("物料分组code") 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 c13f889d5a..52e7870dcd 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 @@ -559,6 +559,8 @@ public class ScmApplyInboundService extends MybatisBaseService createPdf(String cgrkdSid) { - return scmApplyInboundQueryService.createPdf(cgrkdSid); + public ResultBean createPdf(String cgrkdSid,String printerType) { + return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType); + } + + @Override + public ResultBean ctcgykd(String cgrkdSid) { + return scmApplyInboundQueryService.ctcgykd(cgrkdSid); } } 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 c93448010e..c45ce5b8c2 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 @@ -29,10 +29,19 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; 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.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutMaterial; +import com.yxt.anrui.base.common.enums.ManPurOrderType; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; +import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.scm.api.scmapplyinboundquery.*; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; @@ -70,138 +79,230 @@ import java.util.*; @Service public class ScmApplyInboundQueryService extends MybatisBaseService { - @Autowired - private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService; + @Autowired + private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService; + @Autowired + private FinKingDeeFeign finKingDeeFeign; + @Autowired + private BaseVehicleFeign baseVehicleFeign; + @Autowired + private BasePurchaseSystemFeign basePurchaseSystemFeign; - private QueryWrapper createQueryWrapper(ScmApplyInboundQueryQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmApplyInboundQueryQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getApplicationCode())){ - qw.like("applicationCode",query.getApplicationCode()); - } - if (StringUtils.isNotBlank(query.getManPurOrderTypeKey())){ - qw.eq("manPurOrderTypeKey",query.getManPurOrderTypeKey()); - } - if (StringUtils.isNotBlank(query.getOrgDeptSid())){ - qw.eq("orgDeptSid",query.getOrgDeptSid()); - } - if (StringUtils.isNotBlank(query.getManSid())){ - qw.eq("manSid",query.getManSid()); - } - if (StringUtils.isNotBlank(query.getMakeListName())){ - qw.like("makeListName",query.getMakeListName()); - } - qw.eq("createOrgSid",query.getCreateOrgSid()); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmApplyInboundQueryDto dto){ + private QueryWrapper createQueryWrapper(ScmApplyInboundQueryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmApplyInboundQueryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getApplicationCode())) { + qw.like("applicationCode", query.getApplicationCode()); + } + if (StringUtils.isNotBlank(query.getManPurOrderTypeKey())) { + qw.eq("manPurOrderTypeKey", query.getManPurOrderTypeKey()); + } + if (StringUtils.isNotBlank(query.getOrgDeptSid())) { + qw.eq("orgDeptSid", query.getOrgDeptSid()); + } + if (StringUtils.isNotBlank(query.getManSid())) { + qw.eq("manSid", query.getManSid()); + } + if (StringUtils.isNotBlank(query.getMakeListName())) { + qw.like("makeListName", query.getMakeListName()); + } + qw.eq("createOrgSid", query.getCreateOrgSid()); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmApplyInboundQueryDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) {//新增 - ScmApplyInboundQuery entity = new ScmApplyInboundQuery(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - List scmApplyInboundVehQueryList = dto.getScmApplyInboundVehQueryList(); - for (ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto : scmApplyInboundVehQueryList) { - scmApplyInboundVehQueryDto.setMainSid(entity.getSid()); - scmApplyInboundVehQueryService.saveOrUpdateDto(scmApplyInboundVehQueryDto); - } - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ScmApplyInboundQueryDto dto){ - ScmApplyInboundQuery entity = new ScmApplyInboundQuery(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ScmApplyInboundQueryDto dto){ - String dtoSid = dto.getSid(); + ScmApplyInboundQuery entity = new ScmApplyInboundQuery(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + List scmApplyInboundVehQueryList = dto.getScmApplyInboundVehQueryList(); + for (ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto : scmApplyInboundVehQueryList) { + scmApplyInboundVehQueryDto.setMainSid(entity.getSid()); + scmApplyInboundVehQueryService.saveOrUpdateDto(scmApplyInboundVehQueryDto); + } + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmApplyInboundQueryDto dto) { + ScmApplyInboundQuery entity = new ScmApplyInboundQuery(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmApplyInboundQueryDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmApplyInboundQuery entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmApplyInboundQueryDetailsVo fetchDetailsVoBySid(String sid){ - ScmApplyInboundQuery entity = fetchBySid(sid); - ScmApplyInboundQueryDetailsVo vo = new ScmApplyInboundQueryDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + ScmApplyInboundQuery entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmApplyInboundQueryDetailsVo fetchDetailsVoBySid(String sid) { + ScmApplyInboundQuery entity = fetchBySid(sid); + ScmApplyInboundQueryDetailsVo vo = new ScmApplyInboundQueryDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean createPdf(String cgrkdSid,String printerType) { + ResultBean rb = ResultBean.fireFail(); + PdfPath pdfPath = new PdfPath(); + //获取车辆入库单查询 + ScmApplyInboundQuery scmApplyInboundQuery = fetchBySid(cgrkdSid); + //获取车辆入库单车辆信息查询 + List scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); + Map dataMap = new HashMap(); + dataMap.put("priceDate", scmApplyInboundQuery.getOrgPriceDate()); + dataMap.put("manPurOrderType", scmApplyInboundQuery.getManPurOrderTypeValue()); + dataMap.put("billNo", scmApplyInboundQuery.getApplicationCode()); + dataMap.put("orgDeptName", scmApplyInboundQuery.getOrgDeptName()); + dataMap.put("manName", scmApplyInboundQuery.getManName()); + List scmApplyInboundVehQueryMaterials = new ArrayList<>(); + //初始化总数量为1 + int num = 0; + int id = 0; + BigDecimal tPrice = new BigDecimal(0); + //循环获取车辆信息 + for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { + ScmApplyInboundVehQueryMaterial scmApplyInboundVehQueryMaterial = new ScmApplyInboundVehQueryMaterial(); + num = num + 1; + id = id + 1; + BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney()); + tPrice = tPrice.add(settleMoney); + //主车物料编码 + scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8)); + scmApplyInboundVehQueryMaterial.setId(String.valueOf(id)); + scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName()); + scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue()); + scmApplyInboundVehQueryMaterial.setIunit("辆"); + scmApplyInboundVehQueryMaterial.setNum("1"); + scmApplyInboundVehQueryMaterial.setSettleMoney(scmApplyInboundVehQueryDetailsVo.getSettleMoney()); + scmApplyInboundVehQueryMaterial.setLocalName(scmApplyInboundVehQueryDetailsVo.getLocalName()); + scmApplyInboundVehQueryMaterials.add(scmApplyInboundVehQueryMaterial); + } + dataMap.put("wlList", scmApplyInboundVehQueryMaterials); + dataMap.put("zs", num); + dataMap.put("zsettleMoney", tPrice.toString()); + String tPriceDX = TransformMoney.transform(tPrice.toString()); + dataMap.put("tPriceDX", tPriceDX); + dataMap.put("makeName", scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate()); + //获取模板 + //模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + // 生成文件路径 + String targetPath = sourcePath + dateStr; + if (printerType.equals("针孔式打印机")){ + WordUtils.creatWord(dataMap, "cgrkdzks", sourcePath, targetPath, typeName); + }else if (printerType.equals("喷墨式打印机")){ + WordUtils.creatWord(dataMap, "cgrkdpms", sourcePath, targetPath, typeName); + } + //新生成的word路径 + String wordPath = targetPath + "\\" + typeName; + //生成出门证文件名 + String pdfName = "采购入库单_" + dateStr + seconds + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); + pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); + return rb.success().setData(pdfPath); + } - public ResultBean createPdf(String cgrkdSid) { - ResultBean rb = ResultBean.fireFail(); - PdfPath pdfPath = new PdfPath(); - //获取车辆入库单查询 - ScmApplyInboundQuery scmApplyInboundQuery = fetchBySid(cgrkdSid); - //获取车辆入库单车辆信息查询 - List scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); - Map dataMap = new HashMap(); - dataMap.put("priceDate",scmApplyInboundQuery.getOrgPriceDate()); - dataMap.put("manPurOrderType",scmApplyInboundQuery.getManPurOrderTypeValue()); - dataMap.put("billNo",scmApplyInboundQuery.getApplicationCode()); - dataMap.put("orgDeptName",scmApplyInboundQuery.getOrgDeptName()); - dataMap.put("manName",scmApplyInboundQuery.getManName()); - List scmApplyInboundVehQueryMaterials = new ArrayList<>(); - //初始化总数量为1 - int num = 0; - int id = 0; - BigDecimal tPrice = new BigDecimal(0); - //循环获取车辆信息 - for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { - ScmApplyInboundVehQueryMaterial scmApplyInboundVehQueryMaterial = new ScmApplyInboundVehQueryMaterial(); - num = num + 1; - id = id + 1; - BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney()); - tPrice = tPrice.add(settleMoney); - //主车物料编码 - scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8)); - scmApplyInboundVehQueryMaterial.setId(String.valueOf(id)); - scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName()); - scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue()); - scmApplyInboundVehQueryMaterial.setIunit("辆"); - scmApplyInboundVehQueryMaterial.setNum("1"); - scmApplyInboundVehQueryMaterial.setSettleMoney(scmApplyInboundVehQueryDetailsVo.getSettleMoney()); - scmApplyInboundVehQueryMaterial.setLocalName(scmApplyInboundVehQueryDetailsVo.getLocalName()); - scmApplyInboundVehQueryMaterials.add(scmApplyInboundVehQueryMaterial); - } - dataMap.put("wlList",scmApplyInboundVehQueryMaterials); - dataMap.put("zs",num); - dataMap.put("zsettleMoney",tPrice.toString()); - String tPriceDX = TransformMoney.transform(tPrice.toString()); - dataMap.put("tPriceDX",tPriceDX); - dataMap.put("makeName",scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate()); - //获取模板 - //模板路径 - String sourcePath = "D:\\anrui\\upload\\template\\"; - //生成word文件名 - String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); - long seconds = System.currentTimeMillis(); - String typeName = dateStr + seconds + ".doc"; - // 生成文件路径 - String targetPath = sourcePath + dateStr; - WordUtils.creatWord(dataMap, "cgrkd", sourcePath, targetPath, typeName); - //新生成的word路径 - String wordPath = targetPath + "\\" + typeName; - //生成出门证文件名 - String pdfName = "采购入库单_" + dateStr + seconds + ".pdf"; - WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); - pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); - return rb.success().setData(pdfPath); - } + public ResultBean ctcgykd(String cgrkdSid) { + ResultBean rb = ResultBean.fireFail(); + List scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid); + List baseVehicles = new ArrayList<>(); + for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) { + String vehSid = scmApplyInboundVehQueryDetailsVo.getVehSid(); + BaseVehicleSelectVo data = baseVehicleFeign.details(vehSid).getData(); + baseVehicles.add(data); + } + try { + StkInStock stkInStock = new StkInStock(); + BaseVehicleSelectVo 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()); + // 入库日期:FDate (必填项) + stkInStock.setFDate(DateUtil.formatDate(baseVehicle.getPriceDate())); + // 物料列表:FInStockEntry (必填项) + List fInStockEntry = new ArrayList<>(); + //直接调拨单的物料列表 + List FPAYBILLENTRYs = new ArrayList<>(); + for (BaseVehicleSelectVo baseVehicleDto : baseVehicles) { + StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + sf.setWlfz(baseVehicleDto.getCarBrandCode()); + //单价 对应厂家结算价 + sf.setFPrice(baseVehicleDto.getCostPrice() + ""); + //车辆类型 + //厂家采购 + if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || + ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { + //车辆类型-厂家外采和调车 + sf.setCllx(baseVehicleDto.getManufSaleAccessKey()); + sf.setCllxType("sellChannel"); + } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { + //车辆类型-外采主车 + sf.setCllx("60"); + sf.setCllxType("sellChannel"); + //物料分组-外采主车 + sf.setWlfz("99.01"); + } + //存货类别 + 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"); + fInStockEntry.add(sf); + //填充直接调拨单物料列表数据 + StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); + fBillEntry.setFMaterialId(sf.getFMaterialId());//物料编码 + fBillEntry.setFDestStockId("ARZTCK");//调入仓库 + fBillEntry.setFSrcStockId("ARZSCK");//调出仓库 + FPAYBILLENTRYs.add(fBillEntry); + } + stkInStock.setFInStockEntry(fInStockEntry); + ResultBean stringResultBean = finKingDeeFeign.draftStkInStock(stkInStock); + if (stringResultBean.getSuccess()) { + //推送调拨单 + StkTransferDirect stkTransferDirect = new StkTransferDirect(); + stkTransferDirect.setFStockOrgId(stkInStock.getTOrgId()); //调入库存组织 + stkTransferDirect.setFDate(stkInStock.getFDate()); //日期 + stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); + finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); + } + } catch (Exception e) { + e.printStackTrace(); + } + return rb.success(); + } } \ No newline at end of file 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 f175d5d844..2dc4d7059c 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 @@ -541,6 +541,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService scmApplyInboundVehQuerys = new ArrayList<>(); ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto(); + scmApplyInboundVehQueryDto.setVehSid(scmVehicleEnterlibrary.getVehicleSid()); scmApplyInboundVehQueryDto.setVinNo(scmVehicleEnterlibrary.getVinNo()); scmApplyInboundVehQueryDto.setMgroupCode("99.01"); scmApplyInboundVehQueryDto.setMgroupName("外采主车");