Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
9abb130bdf
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  5. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  6. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  7. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  8. 45
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  9. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java
  10. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java
  11. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java
  12. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java
  13. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java
  14. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  15. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
  16. 357
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
  17. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

2
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);
}

3
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;
}

2
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;
}

2
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;
}

2
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<BaseAccadjApplyMa
List<ScmApplyInboundVehQueryDto> 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());

2
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<BaseTrailerMapper, Ba
salOutStock.setFSaleOrgId(baseVehicle.getOrgCode());
}
//客户
salOutStock.setFCustomerID(baseVehicleOut.getCustomerNo());
salOutStock.setFCustomerID(baseVehicleOut.getCwCustomerNo());
//销售部门id
String orgDeptSid = baseVehicleOut.getOrgSid();
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid);

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -95,15 +95,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
ResultBean rb = ResultBean.fireFail();
Boolean b = false;
/* List<BaseVehicleOutQuery> list = dto.getQueryList();
List<String > stringList = list.stream().map(BaseVehicleOutQuery -> BaseVehicleOutQuery.getVinSid()).collect(Collectors.toList());
//根据sid查询出库的车辆是否符合出库条件(库存状态为库存或调入、且问题状态为无问题的、且为相同合同内的,车辆才能出库、可以批量选择)、当选择的车辆不满足条件时,点击出库按钮时
//应给出提示“xx车辆不满足出库条件”、则不能出库
/* List<String> 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 = "";
@ -135,6 +126,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//bdCustomer.setFShortName(dto.getConcatNo());
bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber());
}
} else {
String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
@ -160,6 +152,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
bdCustomer.setFShortName(dto.getConcatNo());
bdCustomers.add(bdCustomer);
finKingDeeFeign.draftBdCustomers(bdCustomers);
dto.setCwCustomerNo(bdCustomer.getFNumber());
} else {
b = true;
return rb.success().setData(b);
@ -916,7 +909,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
String typeName = dateStr + seconds + ".doc";
// 生成文件路径
String targetPath = sourcePath + dateStr;
WordUtils.creatWord(dataMap, "xsckd", sourcePath, targetPath, typeName);
if (printerType.equals("针孔式打印机")){
WordUtils.creatWord(dataMap, "xsckdzks", sourcePath, targetPath, typeName);
}else if (printerType.equals("喷墨式打印机")){
WordUtils.creatWord(dataMap, "xsckdpms", sourcePath, targetPath, typeName);
}
//新生成的word路径
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名

45
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<SysUserMapper, SysUser> {
//根据用户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<String> 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<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
sysStaffOrgVos.removeAll(Collections.singleton(null));
List<String> orgSidPathList = sysStaffOrgVos.stream().map(v -> v.getOrgSidPath()).collect(Collectors.toList());
@ -397,7 +412,19 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
sysUserDefaultOrgService.deleteByUserSid(user.getSid());
}
userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath());
userInfoOneVo.setDefaultOrgPathName(sysUserDefaultOrg.getOrgNamePath());
if (StringUtils.isNotBlank(sysUserDefaultOrg.getOrgSidPath())) {
List<String> 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<SysUserMapper, SysUser> {
orgList1.setOrgName(vv.getOrgNamePath());
String orgName = "";
if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
String[] split = vv.getOrgSidPath().split("/");
List<String> 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<SysUserMapper, SysUser> {
orgName = orgName+"/"+bjName;
}
}
}
}*/
orgList1.setOrgName(orgName);
}
orgList.add(orgList1);

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java

@ -79,5 +79,10 @@ public interface ScmApplyInboundQueryFeign {
@ApiOperation("生成采购入库单pdf")
@PostMapping("/createPdf")
@ResponseBody
ResultBean<PdfPath> createPdf(@RequestParam("cgrkdSid") String cgrkdSid);
ResultBean<PdfPath> createPdf(@RequestParam("cgrkdSid") String cgrkdSid,@RequestParam("printerType") String printerType);
@ApiOperation("重推采购入库单")
@PostMapping("/ctcgykd")
@ResponseBody
ResultBean ctcgykd(@RequestParam("cgrkdSid") String cgrkdSid);
}

8
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<PdfPath> createPdf(String cgrkdSid) {
public ResultBean<PdfPath> createPdf(String cgrkdSid,String printerType) {
return null;
}
@Override
public ResultBean ctcgykd(String cgrkdSid) {
return null;
}
}

2
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")

2
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")

2
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")

2
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<ScmApplyInboundMa
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
scmApplyInboundVehQueryDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(scmApplyInboundVehicleDto.getVinNo(), booad.getUseOrgSid()).getData();
scmApplyInboundVehQueryDto.setVehSid(baseVehicle.getSid());
BaseVehicleSelectVo data4 = baseVehicleFeign.details(scmApplyInboundVehicleDto.getSid()).getData();
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(data4.getCarBrandSid());
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java

@ -94,7 +94,12 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
}
@Override
public ResultBean<PdfPath> createPdf(String cgrkdSid) {
return scmApplyInboundQueryService.createPdf(cgrkdSid);
public ResultBean<PdfPath> createPdf(String cgrkdSid,String printerType) {
return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType);
}
@Override
public ResultBean ctcgykd(String cgrkdSid) {
return scmApplyInboundQueryService.ctcgykd(cgrkdSid);
}
}

357
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<ScmApplyInboundQueryMapper, ScmApplyInboundQuery> {
@Autowired
private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService;
@Autowired
private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
private QueryWrapper<ScmApplyInboundQuery> createQueryWrapper(ScmApplyInboundQueryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInboundQuery> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmApplyInboundQueryVo> listPageVo(PagerQuery<ScmApplyInboundQueryQuery> pq) {
ScmApplyInboundQueryQuery query = pq.getParams();
QueryWrapper<ScmApplyInboundQuery> 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<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmApplyInboundQueryVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmApplyInboundQueryDto dto){
private QueryWrapper<ScmApplyInboundQuery> createQueryWrapper(ScmApplyInboundQueryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInboundQuery> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmApplyInboundQueryVo> listPageVo(PagerQuery<ScmApplyInboundQueryQuery> pq) {
ScmApplyInboundQueryQuery query = pq.getParams();
QueryWrapper<ScmApplyInboundQuery> 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<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq);
IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmApplyInboundQueryVo> 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<ScmApplyInboundVehQueryDto> 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<ScmApplyInboundVehQueryDto> 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<PdfPath> createPdf(String cgrkdSid,String printerType) {
ResultBean rb = ResultBean.fireFail();
PdfPath pdfPath = new PdfPath();
//获取车辆入库单查询
ScmApplyInboundQuery scmApplyInboundQuery = fetchBySid(cgrkdSid);
//获取车辆入库单车辆信息查询
List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
Map<String, Object> dataMap = new HashMap<String, Object>();
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<ScmApplyInboundVehQueryMaterial> 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<PdfPath> createPdf(String cgrkdSid) {
ResultBean rb = ResultBean.fireFail();
PdfPath pdfPath = new PdfPath();
//获取车辆入库单查询
ScmApplyInboundQuery scmApplyInboundQuery = fetchBySid(cgrkdSid);
//获取车辆入库单车辆信息查询
List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
Map<String, Object> dataMap = new HashMap<String, Object>();
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<ScmApplyInboundVehQueryMaterial> 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<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
List<BaseVehicleSelectVo> 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<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
//直接调拨单的物料列表
List<StkTransferDirect.FBillEntry> 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<String> 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();
}
}

1
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<ScmVehicle
scmApplyInboundQueryDto.setBusSid(data6.getSid());
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
scmApplyInboundVehQueryDto.setVehSid(scmVehicleEnterlibrary.getVehicleSid());
scmApplyInboundVehQueryDto.setVinNo(scmVehicleEnterlibrary.getVinNo());
scmApplyInboundVehQueryDto.setMgroupCode("99.01");
scmApplyInboundVehQueryDto.setMgroupName("外采主车");

Loading…
Cancel
Save