From b87605f0ba3aa7e7d81664715c2a37cd3daadf85 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 3 Aug 2023 16:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=80=80=E6=96=99=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseApplyInboundVehQueryMaterial.java | 31 + .../BaseManufacturerRetwareFeign.java | 7 + .../BaseManufacturerRetwareFeignFallback.java | 5 + .../WithdrawalPdfVo.java | 28 + .../BaseManufacturerRetwareRest.java | 76 +- .../BaseManufacturerRetwareService.java | 203 +- .../src/main/resources/ftl/cgtkjgdy.ftl | 3113 +++++++++++++++++ .../src/main/resources/ftl/cgtkzsdy.ftl | 3110 ++++++++++++++++ .../ScmApplyInboundVehQueryFeign.java | 6 + .../ScmApplyInboundVehQueryFeignFallback.java | 5 + .../ScmApplyInboundVehQueryMapper.java | 2 + .../ScmApplyInboundVehQueryRest.java | 9 + .../ScmApplyInboundVehQueryService.java | 4 + 13 files changed, 6545 insertions(+), 54 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseApplyInboundVehQueryMaterial.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/WithdrawalPdfVo.java create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkjgdy.ftl create mode 100644 anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkzsdy.ftl diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseApplyInboundVehQueryMaterial.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseApplyInboundVehQueryMaterial.java new file mode 100644 index 0000000000..2c799f7d95 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseApplyInboundVehQueryMaterial.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basemanufacturerretware; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/3 14:02 + */ +@Data +public class BaseApplyInboundVehQueryMaterial implements Vo { + + @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; // 仓库名称 +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java index f4abd1d8ab..9b9aaaf4a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.api.basemanufacturerretware; import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto; +import com.yxt.anrui.base.api.basevehicleout.PdfPath; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -86,4 +87,10 @@ public interface BaseManufacturerRetwareFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("生成厂家退库库单pdf") + @PostMapping("/withdrawalPdf") + @ResponseBody + ResultBean withdrawalPdf(@RequestParam("cgtkdSid") String cgtkdSid, @RequestParam("printerType") String printerType); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeignFallback.java index b90b23fda0..068f97e5b2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeignFallback.java @@ -80,4 +80,9 @@ public class BaseManufacturerRetwareFeignFallback implements BaseManufacturerRet ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-base/basemanufacturerretware/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean withdrawalPdf(String cjtkdSid, String printerType) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/WithdrawalPdfVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/WithdrawalPdfVo.java new file mode 100644 index 0000000000..bd8d055f7b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/WithdrawalPdfVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basemanufacturerretware; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/8/3 13:57 + */ +@Data +public class WithdrawalPdfVo implements Vo { + private String priceDate; + private String manPurOrderType; + private String billNo; + private String orgDeptName; + private String manName; + private String exitDate; + private String zs; + private String zsettleMoney; + private String tPriceDX; + private String makeName; + private String confirmName; + private List baseApplyInboundVehQueryMaterials = new ArrayList<>(); +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java index 6e5a6db751..928b228aa4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java @@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; + import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetware; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo; @@ -60,46 +61,53 @@ import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFei @RequestMapping("v1/basemanufacturerretware") public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign { - @Autowired - private BaseManufacturerRetwareService baseManufacturerRetwareService; + @Autowired + private BaseManufacturerRetwareService baseManufacturerRetwareService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = baseManufacturerRetwareService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseManufacturerRetwareService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BaseManufacturerRetwareDto dto){ - return baseManufacturerRetwareService.saveOrUpdateDto(dto); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseManufacturerRetwareDto dto) { + return baseManufacturerRetwareService.saveOrUpdateDto(dto); + } - @Override - public ResultBean confirm(BaseManufacturerRetwareVehDto dto) { - return baseManufacturerRetwareService.confirm(dto); - } + @Override + public ResultBean confirm(BaseManufacturerRetwareVehDto dto) { + return baseManufacturerRetwareService.confirm(dto); + } - @Override - public ResultBean createPdf(String sid) { - return baseManufacturerRetwareService.createPdf(sid); - } + @Override + public ResultBean createPdf(String sid) { + return baseManufacturerRetwareService.createPdf(sid); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return baseManufacturerRetwareService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return baseManufacturerRetwareService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return baseManufacturerRetwareService.fetchAll(sid); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return baseManufacturerRetwareService.fetchAll(sid); + } + + @ApiOperation("生成厂家退库库单pdf") + @PostMapping("/withdrawalPdf") + @Override + public ResultBean withdrawalPdf(String cgtkdSid, String printerType) { + return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid,printerType); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index 868ff85c6a..544e26871a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -29,6 +29,7 @@ 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.basemanufacturerretware.*; import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVeh; import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo; import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto; @@ -42,6 +43,7 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedPdfVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; @@ -49,7 +51,17 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.scm.api.scmapplyinboundquery.PdfPath; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign; +import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.utils.TransformMoney; +import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.base.utils.WordUtils; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -57,16 +69,14 @@ 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.base.api.basemanufacturerretware.BaseManufacturerRetware; -import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery; -import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo; -import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDetailsVo; -import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.io.File; +import java.io.InputStream; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -101,6 +111,15 @@ public class BaseManufacturerRetwareService extends MybatisBaseService createQueryWrapper(BaseManufacturerRetwareQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -242,53 +261,53 @@ public class BaseManufacturerRetwareService extends MybatisBaseService withdrawalPdf(String cgtkdSid, String printerType) { + ResultBean rb = ResultBean.fireFail(); + WithdrawalPdfVo pdfVo = new WithdrawalPdfVo(); + String pdfPath = ""; + BaseManufacturerRetware baseManufacturerRetware = fetchBySid(cgtkdSid); + pdfVo.setExitDate(baseManufacturerRetware.getAppluDate()); + pdfVo.setBillNo(baseManufacturerRetware.getApplyNo()); + //查询相关车架号 + List vehVos = baseManufacturerRetwareVehService.fetchByMainSid(cgtkdSid); + vehVos.removeAll(Collections.singleton(null)); + List vinNoList = new ArrayList<>(); + if (!vehVos.isEmpty()) { + for (BaseManufacturerRetwareVehDetailsVo vehVo : vehVos) { + String vinNo = vehVo.getVinNo(); + vinNoList.add(vinNo); + } + } + //初始化总数量为1 + int num = 0; + int id = 0; + BigDecimal tPrice = new BigDecimal(0); + String cgrkdSid = ""; + List baseApplyInboundVehQueryMaterials = new ArrayList<>(); + for (String vinNo : vinNoList) { + ScmApplyInboundVehQueryDetailsVo data = scmApplyInboundVehQueryFeign.fetchDetailsByVinNo(vinNo).getData(); + if (null != data) { + cgrkdSid = data.getMainSid(); + BaseApplyInboundVehQueryMaterial baseApplyInboundVehQueryMaterial = new BaseApplyInboundVehQueryMaterial(); + num = num + 1; + id = id + 1; + BigDecimal settleMoney = new BigDecimal(data.getSettleMoney()); + tPrice = tPrice.add(settleMoney); + //主车物料编码 + baseApplyInboundVehQueryMaterial.setVinNo(data.getVinNo().substring(data.getVinNo().length() - 8)); + baseApplyInboundVehQueryMaterial.setId(String.valueOf(id)); + baseApplyInboundVehQueryMaterial.setMgroupName(data.getMgroupName()); + baseApplyInboundVehQueryMaterial.setVehicleType(data.getVehicleTypeValue()); + baseApplyInboundVehQueryMaterial.setIunit("辆"); + baseApplyInboundVehQueryMaterial.setNum("1"); + baseApplyInboundVehQueryMaterial.setSettleMoney(data.getSettleMoney()); + baseApplyInboundVehQueryMaterial.setLocalName(data.getLocalName()); + baseApplyInboundVehQueryMaterials.add(baseApplyInboundVehQueryMaterial); + } + } + pdfVo.setZs(String.valueOf(num)); + pdfVo.setBaseApplyInboundVehQueryMaterials(baseApplyInboundVehQueryMaterials); + pdfVo.setZsettleMoney(tPrice.toString()); + String tPriceDX = TransformMoney.transform(tPrice.toString()); + pdfVo.setTPriceDX(tPriceDX); + //获取车辆入库单查询 + ScmApplyInboundQueryDetailsVo scmApplyInboundQuery = scmApplyInboundQueryFeign.fetchDetailsBySid(cgrkdSid).getData(); + if (null != scmApplyInboundQuery) { + pdfVo.setPriceDate(scmApplyInboundQuery.getOrgPriceDate()); + pdfVo.setManPurOrderType(scmApplyInboundQuery.getManPurOrderTypeValue()); + pdfVo.setOrgDeptName(scmApplyInboundQuery.getOrgDeptName()); + pdfVo.setManName(scmApplyInboundQuery.getManName()); + pdfVo.setMakeName(scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate()); + } + String filePath = "/template/"; + if (printerType.equals("针孔式打印机")) { + String cgtkzsdy = cgtkzsdy(pdfVo); + pdfPath = filePath + cgtkzsdy; + } else if (printerType.equals("激光打印机")) { + String cgtkjgdy = cgtkjgdy(pdfVo); + pdfPath = filePath + cgtkjgdy; + } + return rb.success().setData(pdfPath); + } + + public String cgtkjgdy(WithdrawalPdfVo pdfVo) { + Map dataMap = new HashMap(); + dataMap.put("priceDate", pdfVo.getPriceDate()); + dataMap.put("exitDate", pdfVo.getExitDate()); + dataMap.put("manPurOrderType", pdfVo.getManPurOrderType()); + dataMap.put("billNo", pdfVo.getBillNo()); + dataMap.put("orgDeptName", pdfVo.getOrgDeptName()); + dataMap.put("manName", pdfVo.getManName()); + dataMap.put("wlList", pdfVo.getBaseApplyInboundVehQueryMaterials()); + dataMap.put("zs", pdfVo.getZs()); + dataMap.put("zsettleMoney", pdfVo.getZsettleMoney()); + dataMap.put("tPriceDX", pdfVo.getTPriceDX()); + dataMap.put("makeName", pdfVo.getMakeName()); + dataMap.put("confirmName", ""); + //获取模板 + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/cgtkjgdy.ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "cgtkjgdy" + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成出门证文件名 + String pdfName = "退料单" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + String path = pdfName; + return path; + } + + public String cgtkzsdy(WithdrawalPdfVo pdfVo) { + Map dataMap = new HashMap(); + dataMap.put("priceDate", pdfVo.getPriceDate()); + dataMap.put("exitDate", pdfVo.getExitDate()); + dataMap.put("manPurOrderType", pdfVo.getManPurOrderType()); + dataMap.put("billNo", pdfVo.getBillNo()); + dataMap.put("orgDeptName", pdfVo.getOrgDeptName()); + dataMap.put("manName", pdfVo.getManName()); + dataMap.put("wlList", pdfVo.getBaseApplyInboundVehQueryMaterials()); + dataMap.put("zs", pdfVo.getZs()); + dataMap.put("zsettleMoney", pdfVo.getZsettleMoney()); + dataMap.put("tPriceDX", pdfVo.getTPriceDX()); + dataMap.put("makeName", pdfVo.getMakeName()); + dataMap.put("confirmName", ""); + //获取模板 + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/cgtkzsdy.ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "cgtkzsdy" + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成出门证文件名 + String pdfName = "退料单" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + String path = pdfName; + return path; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkjgdy.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkjgdy.ftl new file mode 100644 index 0000000000..0d2745fe45 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkjgdy.ftl @@ -0,0 +1,3113 @@ + + + + God + FAN + 2014-10-29T12:08:00Z + 2023-08-03T06:46:29Z + 347040 + 1 + 78 + 276 + 0 + 0 + 276 + 14 + + + 2052-12.1.0.15120 + 5593B9CB86C04088A624094FD36129CC_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购退料单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 入库日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${priceDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 退库日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${exitDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${orgDeptName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购类型： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${manPurOrderType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 供货单位： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${manName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料分组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计量单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 结算金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.id!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mgroupName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vehicleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.iunit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.num!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.settleMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.localName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zs!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zsettleMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + PAGE \* MERGEFORMAT + + + + + + 1 + + + + + + 页 共 + + + + + + NUMPAGES \* MERGEFORMAT + + + + + + 1 + + + + + + 页 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkzsdy.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkzsdy.ftl new file mode 100644 index 0000000000..d488b000a7 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/cgtkzsdy.ftl @@ -0,0 +1,3110 @@ + + + + God + FAN + 2014-10-29T12:08:00Z + 2023-08-03T06:46:58Z + 1 + 78 + 276 + 0 + 0 + 276 + 14 + + + 2052-12.1.0.15120 + F78B658C77104F69820AA7711EFEADAE_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购退料单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 入库日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${priceDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 退库日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${exitDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${orgDeptName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 采购类型： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${manPurOrderType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 供货单位： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${manName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料分组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 计量单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 结算金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.id!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mgroupName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vehicleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.iunit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.num!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.settleMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.localName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zs!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zsettleMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + PAGE \* MERGEFORMAT + + + + + + 1 + + + + + + 页 共 + + + + + + NUMPAGES \* MERGEFORMAT + + + + + + 1 + + + + + + 页 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审核人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java index 3f42f7dc2b..a54267dda9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeign.java @@ -75,4 +75,10 @@ public interface ScmApplyInboundVehQueryFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据车架号获取一条记录") + @GetMapping("/fetchDetailsByVinNo") + @ResponseBody + public ResultBean fetchDetailsByVinNo(@RequestParam("vinNo") String vinNo); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java index 32c413c309..e4531912ba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehquery/ScmApplyInboundVehQueryFeignFallback.java @@ -69,4 +69,9 @@ public class ScmApplyInboundVehQueryFeignFallback implements ScmApplyInboundVehQ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmapplyinboundvehquery/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean fetchDetailsByVinNo(String vinNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java index e4b4d6ba92..be2c9c6f54 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java @@ -66,4 +66,6 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper fetchByMainSid(String cgrkdSid); + @Select("select * from scm_apply_inbound_veh_query where vinNo = #{vinNo}") + ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(String vinNo); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java index 72700d729a..441af7ffcd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryRest.java @@ -97,4 +97,13 @@ public class ScmApplyInboundVehQueryRest implements ScmApplyInboundVehQueryFeign ScmApplyInboundVehQueryDetailsVo vo = scmApplyInboundVehQueryService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsByVinNo") + public ResultBean fetchDetailsByVinNo(String vinNo) { + ResultBean rb = ResultBean.fireFail(); + ScmApplyInboundVehQueryDetailsVo vo = scmApplyInboundVehQueryService.fetchDetailsByVinNo(vinNo); + return rb.success().setData(vo); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java index cd3f69f0ea..eb0484a3e8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryService.java @@ -111,4 +111,8 @@ public class ScmApplyInboundVehQueryService extends MybatisBaseService fetchByMainSid(String cgrkdSid) { return baseMapper.fetchByMainSid(cgrkdSid); } + + public ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(String vinNo) { + return baseMapper.fetchDetailsByVinNo(vinNo); + } } \ No newline at end of file