yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 2 years ago
parent
2894b49dfc
commit
eaa1fc3530
33 changed files with 484 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  5. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  6. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  9. 64
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  10. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  11. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  12. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  13. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  14. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  15. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  16. 16
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/PdfPath.java
  17. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  18. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  19. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/PdfPath.java
  20. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java
  21. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java
  22. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java
  23. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java
  24. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java
  25. 67
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java
  26. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java
  27. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java
  28. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  29. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
  30. 99
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
  31. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java
  32. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java
  33. 70
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java
View File

@ -80,5 +80,6 @@ public class BaseAccadjApply extends BaseEntity {
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
View File

@ -75,6 +75,8 @@ public class BaseAccadjApplyDetailsVo implements Vo {
private String taskId; // taskId
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java
View File

@ -77,6 +77,8 @@ public class BaseAccadjApplyDto implements Dto {
private String nodeState; // 流程状态
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
@ApiModelProperty("调账车辆类型sid")
private List<String> accSids; // 调账车辆类型sid
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
View File

@ -245,4 +245,9 @@ public interface BaseManufacturerFeign {
@GetMapping("/getBankList")
@ResponseBody
ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid);
@ApiOperation("根据供应商code查询供应商信息")
@GetMapping("/fetchByCode")
@ResponseBody
ResultBean<BaseManufacturerDetailsVo> fetchByCode(@RequestParam("supplierCode") String supplierCode);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
View File

@ -155,4 +155,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
public ResultBean<List<ManBankVo>> getBankList(String sid) {
return null;
}
@Override
public ResultBean<BaseManufacturerDetailsVo> fetchByCode(String supplierCode) {
return null;
}
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
View File

@ -52,6 +52,8 @@ import java.math.BigDecimal;
public class BaseOutsourcingApplication extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("外采申请单sid")
private String sid; // 外采申请单sid
@ApiModelProperty(value = "车辆型号")
private String vehMark;
@ApiModelProperty("申请编号")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
View File

@ -52,6 +52,8 @@ import java.util.List;
@Data
public class BaseOutsourcingApplicationDetailsVo implements Vo {
@ApiModelProperty("外采申请单sid")
private String sid; // 外采申请单sid
@ApiModelProperty("申请编号")
private String applicationCode; // 申请编号
@ApiModelProperty(value = "车辆型号")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
View File

@ -58,7 +58,7 @@ import java.util.List;
public class BaseOutsourcingApplicationDto implements Dto {
@ApiModelProperty("外采申请单sid")
private String sid; // 申请编号
private String sid; // 外采申请单sid
@ApiModelProperty(value = "车辆型号")
private String vehMark;
@ApiModelProperty("创建人sid")

64
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -37,22 +37,31 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
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.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
import com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
@ -74,6 +83,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
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.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.utils.HanZiConverterPinYin;
@ -136,6 +149,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
private BaseManufacturerBankService baseManufacturerBankService;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
@Autowired
private BaseInternalPurchaseService baseInternalPurchaseService;
@Autowired
BaseVehicleModelService baseVehicleModelService;
@Autowired
private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -548,6 +567,51 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
stkInStock.setFInStockEntry(fInStockEntry);
finKingDeeFeign.draftStkInStock(stkInStock);
//推送车辆入库查询
ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
scmApplyInboundQueryDto.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.NG_ORDER.getCode());
scmApplyInboundQueryDto.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.NG_ORDER.getRemarks());
scmApplyInboundQueryDto.setApplicationCode(baseAccadjApply.getApplyNo());
BaseInternalPurchase baseInternalPurchase = baseInternalPurchaseService.fetchBySid(baseInternalPurchaseVehicle1.getMainSid());
scmApplyInboundQueryDto.setOrgDeptSid(baseInternalPurchase.getCallInBuyerOrgSid());
SysOrganizationVo data7 = sysOrganizationFeign.fetchBySid(baseInternalPurchase.getCallInBuyerOrgSid()).getData();
scmApplyInboundQueryDto.setOrgDeptName(data7.getName());
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo1 = basePurchaseSystemService.fetchDetailsByDeptSid(baseInternalPurchase.getCallInBuyerOrgSid()).getData();
scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo1.getPurchaseSystemName());
scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo1.getOrgCode());
scmApplyInboundQueryDto.setManSid(baseAccadjApply.getCallOutOrgSid());
scmApplyInboundQueryDto.setManName(baseAccadjApply.getCallInOrgName());
SysOrganizationVo data4 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()).getData();
scmApplyInboundQueryDto.setManCode(data4.getOrgCode());
scmApplyInboundQueryDto.setMakeListSid(baseAccadjApply.getCreateBySid());
SysUserVo data3 = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
scmApplyInboundQueryDto.setMakeListName(data3.getName());
scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCreateOrgSid());
SysOrganizationVo data6 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
scmApplyInboundQueryDto.setCreateOrgName(data6.getName());
scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());
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());
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle1.getCarBrandSid());
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
BaseVehicleModel data5 = baseVehicleModelService.selectDetails(baseVehicle1.getModelSid()).getData();
scmApplyInboundVehQueryDto.setVehicleTypeKey(data5.getVehicleType());
scmApplyInboundVehQueryDto.setVehicleTypeValue(data5.getVehicleTypeValue());
scmApplyInboundVehQueryDto.setIunit("辆");
scmApplyInboundVehQueryDto.setNum("1");
scmApplyInboundVehQueryDto.setSettleMoney(baseInternalPurchaseVehicle.getWitPinMoney().toString());
scmApplyInboundVehQueryDto.setLocalName("在途仓库");
scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
}
scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);
//推送财务供应商信息
List<BasePurchaseSystemDetailsVo> data1 = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(baseAccadjApply.getCallOutOrgSid()).getData();
if (data1 != null){

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basemanufacturer.*;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -151,4 +152,7 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<BaseManufacturerVo> getGysTypeByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
List<ManufacturerVo> getDetailsList(String orgSid);
@Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}")
BaseManufacturerDetailsVo fetchByCode(String supplierCode);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
View File

@ -247,4 +247,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
public ResultBean<List<ManBankVo>> getBankList(String sid) {
return baseManufacturerService.getBankList(sid);
}
@Override
public ResultBean<BaseManufacturerDetailsVo> fetchByCode(String supplierCode) {
return baseManufacturerService.fetchByCode(supplierCode);
}
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
View File

@ -801,4 +801,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<ManBankVo> bankVoList = baseManufacturerBankService.getBankList(sid);
return rb.success().setData(bankVoList);
}
public ResultBean<BaseManufacturerDetailsVo> fetchByCode(String supplierCode) {
ResultBean rb = ResultBean.fireFail();
BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.fetchByCode(supplierCode);
return rb.success().setData(baseManufacturerDetailsVo);
}
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -888,8 +888,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
dataMap.put("zxszr", tSalesAllowance.toString());
String tPriceDX = TransformMoney.transform(tPrice.toString());
dataMap.put("tPriceDX", tPriceDX);
dataMap.put("makeName", createByName);
dataMap.put("makeDate", DateUtil.format(new Date(), "yyyy-MM-dd"));
dataMap.put("makeName", createByName + DateUtil.formatDate(new Date()));
dataMap.put("confirmName", "");
dataMap.put("confirmDate", "");
//获取模板

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
View File

@ -84,6 +84,10 @@ public interface FinCollectionConfirmationFeign {
@PostMapping("/cashierReject")
public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery);
@ApiOperation("生成收款单pdf")
@PostMapping("/createPdf")
@ResponseBody
ResultBean<PdfPath> createPdf(@RequestParam("skdSid") String skdSid);
/*---------------------App接口 ---------------------*/
@ApiOperation("手机端—获取款项确认列表")

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
View File

@ -83,6 +83,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
return null;
}
@Override
public ResultBean<PdfPath> createPdf(String skdSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null;

16
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/PdfPath.java
View File

@ -0,0 +1,16 @@
package com.yxt.anrui.fin.api.fincollectionconfirmation;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PdfPath {
@ApiModelProperty("pdf文件路径")
private String pdfPath;
@ApiModelProperty("附件文件路径")
private String fjPath;
@ApiModelProperty("附件文件后缀")
private String fjType;
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
View File

@ -103,6 +103,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
return finCollectionConfirmationService.cashierReject(finCollectionRejectQuery);
}
@Override
public ResultBean<PdfPath> createPdf(String skdSid) {
return finCollectionConfirmationService.createPdf(skdSid);
}
/**
* 手机端—获取款项确认列表
*

66
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -76,10 +76,15 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.TransformMoney;
import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -1943,4 +1948,65 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinCollectionConfirmation finCollectionConfirmation = baseMapper.selectByBusSid(virtualOrderSid);
return rb.success().setData(finCollectionConfirmation);
}
public ResultBean<PdfPath> createPdf(String skdSid) {
ResultBean rb = ResultBean.fireFail();
PdfPath pdfPath = new PdfPath();
/*//获取收款单信息
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(skdSid);
//获取车辆入库单车辆信息查询
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);
}
}

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/PdfPath.java
View File

@ -0,0 +1,16 @@
package com.yxt.anrui.scm.api.scmapplyinboundquery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PdfPath {
@ApiModelProperty("pdf文件路径")
private String pdfPath;
@ApiModelProperty("附件文件路径")
private String fjPath;
@ApiModelProperty("附件文件后缀")
private String fjType;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeign.java
View File

@ -75,4 +75,9 @@ public interface ScmApplyInboundQueryFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("生成采购入库单pdf")
@PostMapping("/createPdf")
@ResponseBody
ResultBean<PdfPath> createPdf(@RequestParam("cgrkdSid") String cgrkdSid);
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryFeignFallback.java
View File

@ -69,4 +69,9 @@ public class ScmApplyInboundQueryFeignFallback implements ScmApplyInboundQueryFe
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmapplyinboundquery/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PdfPath> createPdf(String cgrkdSid) {
return null;
}
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQuery.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -55,9 +56,9 @@ public class ScmApplyInboundVehQuery extends BaseEntity {
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组code")
private String mGroupCode; // 物料分组code
private String mgroupCode; // 物料分组code
@ApiModelProperty("物料分组名称")
private String mGroupName; // 物料分组名称
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型key")
private String vehicleTypeKey; // 车辆类型key
@ApiModelProperty("车辆类型value")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDetailsVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -56,9 +57,9 @@ public class ScmApplyInboundVehQueryDetailsVo implements Vo {
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组code")
private String mGroupCode; // 物料分组code
private String mgroupCode; // 物料分组code
@ApiModelProperty("物料分组名称")
private String mGroupName; // 物料分组名称
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型key")
private String vehicleTypeKey; // 车辆类型key
@ApiModelProperty("车辆类型value")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryDto.java
View File

@ -57,11 +57,9 @@ public class ScmApplyInboundVehQueryDto implements Dto {
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组code")
@JsonProperty("mGroupCode")
private String mGroupCode; // 物料分组code
private String mgroupCode; // 物料分组code
@ApiModelProperty("物料分组名称")
@JsonProperty("mGroupName")
private String mGroupName; // 物料分组名称
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型key")
private String vehicleTypeKey; // 车辆类型key
@ApiModelProperty("车辆类型value")

67
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryMaterial.java
View File

@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
* File: ScmApplyInboundVehQuery.java <br/>
* Class: com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery <br/>
* Description: 车辆入库单车辆查询. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-28 15:55:31 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
public class ScmApplyInboundVehQueryMaterial {
@ApiModelProperty("序号")
private String id; // 序号
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组名称")
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型value")
private String vehicleType; // 车辆类型value
@ApiModelProperty("计量单位")
private String iunit; // 计量单位
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("结算金额")
private String settleMoney; // 结算金额
@ApiModelProperty("仓库名称")
private String localName; // 仓库名称
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryQuery.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
@ -54,9 +55,9 @@ public class ScmApplyInboundVehQueryQuery implements Query {
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组code")
private String mGroupCode; // 物料分组code
private String mgroupCode; // 物料分组code
@ApiModelProperty("物料分组名称")
private String mGroupName; // 物料分组名称
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型key")
private String vehicleTypeKey; // 车辆类型key
@ApiModelProperty("车辆类型value")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmapplyinboundvehquery;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -56,9 +57,9 @@ public class ScmApplyInboundVehQueryVo implements Vo {
@ApiModelProperty("物料编号")
private String vinNo; // 物料编号
@ApiModelProperty("物料分组code")
private String mGroupCode; // 物料分组code
private String mgroupCode; // 物料分组code
@ApiModelProperty("物料分组名称")
private String mGroupName; // 物料分组名称
private String mgroupName; // 物料分组名称
@ApiModelProperty("车辆类型key")
private String vehicleTypeKey; // 车辆类型key
@ApiModelProperty("车辆类型value")

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -533,20 +533,24 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
scmApplyInboundQueryDto.setCreateOrgName(booad.getUseOrgName());
scmApplyInboundQueryDto.setBusSid(booad.getSid());
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
/*for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
scmApplyInboundVehQueryDto.setVinNo(scmApplyInboundVehicleDto.getVinNo());
scmApplyInboundVehQueryDto.setMGroupCode(scmApplyInboundVehicleDto.get);
scmApplyInboundVehQueryDto.setMGroupName();
scmApplyInboundVehQueryDto.setVehicleTypeKey();
scmApplyInboundVehQueryDto.setVehicleTypeValue();
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();
scmApplyInboundVehQueryDto.setLocalSid();
scmApplyInboundVehQueryDto.setLocalName();
scmApplyInboundVehQueryDto.setLocalCode();
}*/
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())) {

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmapplyinboundquery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
@ -97,4 +92,9 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PdfPath> createPdf(String cgrkdSid) {
return scmApplyInboundQueryService.createPdf(cgrkdSid);
}
}

99
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
View File

@ -26,24 +26,33 @@
package com.yxt.anrui.scm.biz.scmapplyinboundquery;
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.basevehicle.BaseVehicle;
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.scm.api.scmapplyinboundquery.*;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQuery;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial;
import com.yxt.anrui.scm.biz.scmapplyinboundvehquery.ScmApplyInboundVehQueryService;
import com.yxt.common.base.utils.TransformMoney;
import com.yxt.common.base.utils.WordUtils;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
/**
* Project: anrui-scm(车辆入库单查询) <br/>
@ -60,6 +69,10 @@ import java.util.List;
*/
@Service
public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInboundQueryMapper, ScmApplyInboundQuery> {
@Autowired
private ScmApplyInboundVehQueryService scmApplyInboundVehQueryService;
private QueryWrapper<ScmApplyInboundQuery> createQueryWrapper(ScmApplyInboundQueryQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -79,8 +92,15 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
public void saveOrUpdateDto(ScmApplyInboundQueryDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {//新增
this.insertByDto(dto);
return;
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);
}
@ -107,4 +127,65 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
BeanUtil.copyProperties(entity, vo);
return vo;
}
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);
}
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java
View File

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +63,7 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper<ScmApplyInboun
@Select("select * from scm_apply_inbound_veh_query")
List<ScmApplyInboundVehQueryVo> selectListVo();
@Select("select * from scm_apply_inbound_veh_query where mainSid = #{cgrkdSid}")
List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java
View File

@ -107,4 +107,8 @@ public class ScmApplyInboundVehQueryService extends MybatisBaseService<ScmApplyI
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid) {
return baseMapper.fetchByMainSid(cgrkdSid);
}
}

70
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.biz.scmvehicleenterlibrary;
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.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
@ -44,8 +46,12 @@ 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.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.enums.VehicleState;
@ -56,11 +62,16 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
import com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryService;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -133,6 +144,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
private BaseManufacturerBankFeign baseManufacturerBankFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private BaseVehicleModelFeign baseVehicleModelFeign;
@Autowired
private ScmApplyInboundQueryService scmApplyInboundQueryService;
private QueryWrapper<ScmVehicleEnterlibrary> createQueryWrapper(ScmVehicleEnterlibraryQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -191,10 +206,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
public IPage<ScmVehicleEnterlibraryPageVo> selectCarWarehousingList(PagerQuery<ScmVehicleEnterlibraryPageQuery> pq) {
IPage<ScmVehicleEnterlibraryPageQuery> page = PagerUtil.queryToPage(pq);
ScmVehicleEnterlibraryPageQuery params = pq.getParams();
if(StringUtils.isNotBlank(params.getOrgPath())){
if (StringUtils.isNotBlank(params.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
params.setUseOrgSid(useOrgSid);
}else{
} else {
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
params.setUseOrgSid(useOrgSid);
}
@ -399,9 +414,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
//stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
BaseVehicle data1 = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), scmVehicleEnterlibrary.getUseOrgSid()).getData();
BasePurchaseSystemDetailsVo data2 = basePurchaseSystemFeign.fetchDetailsByDeptSid(data1.getPurchaseSystemSid()).getData();
if (data2 != null){
if (data2 != null) {
stkTransferDirect.setFStockOrgId(data2.getOrgCode()); //调入库存组织
}else {
} else {
stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
}
stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
@ -500,8 +515,47 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
List<BaseVehicleDto> 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<ScmApplyInboundVehQueryDto> 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())) {
BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
@ -524,7 +578,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vehicleDetailsVo.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid()).getData();
baseVehicleDto.setEngineNo(baseVehicle.getEngineNo());
baseVehicleDto.setOrderingNo(baseVehicle.getOrderingNo());
if (baseVehicle.getDepartureDate() != null){
if (baseVehicle.getDepartureDate() != null) {
baseVehicleDto.setDepartureDate(new SimpleDateFormat("yyyy-MM-dd").format(baseVehicle.getDepartureDate()));
}
baseVehicleDto.setVehMark(baseVehicle.getVehMark());
@ -580,7 +634,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid());
//厂家回款通路sid 厂家回款通路名称
if (baseVehicleResultBean.getData() != null) {
if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessSid())){
if (StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessSid())) {
baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
//厂家回款通路类别key
BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.details(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData();
@ -590,7 +644,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
}
}
if(StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessName())){
if (StringUtils.isNotBlank(baseVehicleResultBean.getData().getManufSaleAccessName())) {
baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
}
}

Write Preview
Loading…
Cancel
Save