From 338251355a41a0348806c3f77203eee9fcba4a44 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 6 Aug 2024 11:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillService.java | 70 +- yxt-as/src/main/resources/application-pro.yml | 5 + .../src/main/resources/ftl/baoneilingliao.ftl | 2079 ++++++++++++++++- .../src/main/resources/ftl/baowailingliao.ftl | 2056 +++++++++++++++- .../yxt/sms/apiadmin/SmsSalesBillRest.java | 6 + .../smssalesbill/PrintPdfDetailsPdfVo.java | 25 + .../sms/biz/smssalesbill/PrintPdfQuery.java | 16 + .../yxt/sms/biz/smssalesbill/PrintPdfVo.java | 32 + .../sms/biz/smssalesbill/SalesGoodsVo.java | 28 +- .../sms/biz/smssalesbill/SalesInvoiceVo.java | 3 +- .../sms/biz/smssalesbill/SmsAttachitemVo.java | 2 + .../biz/smssalesbill/SmsSalesBillMapper.xml | 38 +- .../biz/smssalesbill/SmsSalesBillService.java | 204 +- .../smssalesbill/SmsWmsInventorySalesVo.java | 39 +- .../smssalesbillaitem/SmsSalesBillAitem.java | 3 +- .../SmsSalesBillDetail.java | 24 + .../SmsSalesBillInvoice.java | 6 +- .../src/main/resources/application-pro.yml | 4 + .../src/main/resources/ftl/xiaoshoudan.ftl | 2014 ++++++++++++++++ .../main/resources/ftl/配件销售单.doc | Bin 0 -> 22528 bytes 20 files changed, 6610 insertions(+), 44 deletions(-) create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfDetailsPdfVo.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfQuery.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfVo.java create mode 100644 yxt-sms-biz/src/main/resources/ftl/xiaoshoudan.ftl create mode 100644 yxt-sms-biz/src/main/resources/ftl/配件销售单.doc diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 4bd5608ef4..34d62ffe3b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -2120,7 +2120,6 @@ public class AsBusrepairBillService extends MybatisBaseService dataMap = new HashMap(); + List> list = new ArrayList<>(); + dataMap.put("company", vo.getCompany()); + dataMap.put("dept", vo.getDept()); + dataMap.put("customer", vo.getCustomer()); + dataMap.put("billNo", vo.getBillNo()); + dataMap.put("vinNo", vo.getVinNo()); + dataMap.put("vehMark", vo.getVehMark()); + dataMap.put("isKp", vo.getIsKp()); + dataMap.put("caps", vo.getCaps()); + dataMap.put("amountTotal", vo.getAmountTotal()); + dataMap.put("userName", vo.getUserName()); + dataMap.put("nowDate", vo.getNowDate()); + List goods = vo.getGoods(); + if (!goods.isEmpty()) { + for (RepairBillDetailsPdfVo good : goods) { + Map map = new HashMap<>(); + map.put("sortNo", good.getSortNo()); + map.put("goodsSpuName", good.getGoodsSpuName()); + map.put("goodsSkuCode", good.getGoodsSkuCode()); + map.put("goodsSkuOwnSpec", good.getGoodsSkuOwnSpec()); + map.put("unit", good.getUnit()); + map.put("currentCount", good.getCurrentCount()); + map.put("price", good.getPrice()); + map.put("amount", good.getAmount()); + map.put("receivedTime", good.getReceivedTime()); + map.put("remarks", good.getRemarks()); + map.put("operName", good.getOperName()); + list.add(map); + } + } + dataMap.put("list", list); + String temp = "/template/"; + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String ftl = ""; + + if (subject.equals("保内")) { + ftl = "ftl/baoneilingliao.ftl"; + } else if (subject.equals("保外")) { + ftl = "ftl/baowailingliao.ftl"; + } + try { + //获取模板 + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(ftl); + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "templateSettle" + 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); + finalPath = temp + pdfName; + } catch (NoClassDefFoundError e) { + e.printStackTrace(); + finalPath = targetPath; + } + return finalPath; } } diff --git a/yxt-as/src/main/resources/application-pro.yml b/yxt-as/src/main/resources/application-pro.yml index dc3c131f08..860c570fde 100644 --- a/yxt-as/src/main/resources/application-pro.yml +++ b/yxt-as/src/main/resources/application-pro.yml @@ -26,3 +26,8 @@ image: path: D:\anrui\upload\ url: prefix: http://120.46.172.184/api/upload/ +templateUrl: + uploadUrl: D:\anrui\upload\template\ + prefixUrl: http://120.46.172.184/api/upload/template/ + + diff --git a/yxt-as/src/main/resources/ftl/baoneilingliao.ftl b/yxt-as/src/main/resources/ftl/baoneilingliao.ftl index 89b66090f6..103706f6a8 100644 --- a/yxt-as/src/main/resources/ftl/baoneilingliao.ftl +++ b/yxt-as/src/main/resources/ftl/baoneilingliao.ftl @@ -1,3 +1,2080 @@ -AdministratorFAN2024-08-05T08:55:15Z2024-08-05T09:19:42Z0111245500455142052-12.1.0.171473965BA75B017452184E8C1B6FB5F3239_13${company!}（${dept!}）配件领料单维修单号：${billNo!}科目：${subject!}客户：${customer!}车架号：${vinNo!}车牌号：${vehMark!}序号商品名称图号规格仓库-库区库位单位数量成本单价成本金额领料人领料日期备注${list.sortNo!}${list.goodsSpuName!}${list.goodsSkuCode!}${list.goodsSkuOwnSpec!}${list.houseInfo!}${list.warehouseRackCode!}${list.unit!}${list.currentCount!}${list.price!}${list.amount!}${list.operName!}${list.receivedTime!}${list.remarks!}合计（大写）：${caps!}￥：${amountTotal!}元制单人：${userName!}打印日期：${nowDate!} \ No newline at end of file + + Administrator + FAN + 2024-08-05T08:55:15Z + 2024-08-05T09:19:42Z + 0 + 1 + 112 + 455 + 0 + 0 + 455 + 14 + + + 2052-12.1.0.17147 + 3965BA75B017452184E8C1B6FB5F3239_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${company!}（${dept!}） + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 配件领料单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 维修单号： + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 科目： + + + + + + + + + + ${subject!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户： + + + + + + + + + + ${customer!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号： + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车牌号： + + + + + + + + + + ${vehMark!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 商品名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 图号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 规格 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库-库区 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 库位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 成本单价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 成本金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 领料人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 领料日期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + <#list list as list> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.sortNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSpuName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSkuCode!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSkuOwnSpec!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.houseInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.warehouseRackCode!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.unit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.currentCount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.amount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.operName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.receivedTime!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计（大写）： + + + + + + + + + + ${caps!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ￥：${amountTotal!}元 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + ${userName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 打印日期： + + + + + + + + + + ${nowDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yxt-as/src/main/resources/ftl/baowailingliao.ftl b/yxt-as/src/main/resources/ftl/baowailingliao.ftl index 6824c59079..95d6638d45 100644 --- a/yxt-as/src/main/resources/ftl/baowailingliao.ftl +++ b/yxt-as/src/main/resources/ftl/baowailingliao.ftl @@ -1,3 +1,2057 @@ -AdministratorFAN2024-08-05T08:55:15Z2024-08-05T09:19:12Z1440100000142052-12.1.0.171476DFD2094D5694D4D997432A7411DEE55_13${company!}（${dept!}）配件领料单维修单号：${billNo!}科目：${subject!}是否开票：${isKp!}客户：${customer!}车架号：${vinNo!}车牌号：${vehMark!}序号商品名称图号规格仓库-库区库位单位数量销售单价销售金额领料人领料日期备注${list.sortNo!}${list.goodsSpuName!}${list.goodsSkuCode!}${list.goodsSkuOwnSpec!}${list.houseInfo!}${list.warehouseRackCode!}${list.unit!}${list.currentCount!}${list.price!}${list.amount!}${list.operName!}${list.receivedTime!}${list.remarks!}合计（大写）：${caps!}￥：${amountTotal!}元制单人：${userName!}打印日期：${nowDate!} \ No newline at end of file + + Administrator + FAN + 2024-08-05T08:55:15Z + 2024-08-05T09:19:12Z + 1440 + 1 + 0 + 0 + 0 + 0 + 0 + 14 + + + 2052-12.1.0.17147 + 6DFD2094D5694D4D997432A7411DEE55_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${company!}（${dept!}） + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 配件领料单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 维修单号： + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 科目： + + + + + + + + + + ${subject!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是否开票： + + + + + + + + + + ${isKp!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户： + + + + + + + + + + ${customer!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号： + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车牌号： + + + + + + + + + + ${vehMark!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 商品名称 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 图号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 规格 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库-库区 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 库位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售单价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 领料人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 领料日期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + <#list list as list> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.sortNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSpuName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSkuCode!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.goodsSkuOwnSpec!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.houseInfo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.warehouseRackCode!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.unit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.currentCount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.amount!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.operName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.receivedTime!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${list.remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计（大写）： + + + + + + + + + + ${caps!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ￥：${amountTotal!}元 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + ${userName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 打印日期： + + + + + + + + + + ${nowDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java index 3f1c9d7dd1..eedfe24d1f 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java @@ -143,6 +143,12 @@ public class SmsSalesBillRest { } + @ApiOperation("打印配件销售单") + @PostMapping("/printSmsBill") + public ResultBean printSmsBill(@RequestBody PrintPdfQuery query) { + return smsSalesBillService.printSmsBill(query); + } + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfDetailsPdfVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfDetailsPdfVo.java new file mode 100644 index 0000000000..3851e6dc15 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfDetailsPdfVo.java @@ -0,0 +1,25 @@ +package com.yxt.sms.biz.smssalesbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/5 17:28 + */ +@Data +public class PrintPdfDetailsPdfVo { + + private String sortNo; //序号 + private String goodsSpuName; //商品名称 + private String goodsSkuCode; //图号 + private String goodsSkuOwnSpec; //规格 + private String unit; //单位 + private String count; //数量 + private String price; //单价 + private String amount; //销售金额 + private String remarks; //备注 + private String discountAmount; //优惠 + private String discount; //折扣 + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfQuery.java new file mode 100644 index 0000000000..be72a4f469 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfQuery.java @@ -0,0 +1,16 @@ +package com.yxt.sms.biz.smssalesbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/1 10:09 + */ +@Data +public class PrintPdfQuery { + private String sid; + private String useOrgSid; //部门sid + private String createOrgSid; //分公司sid + private String userSid; //登录用户sid +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfVo.java new file mode 100644 index 0000000000..31de7ff512 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/PrintPdfVo.java @@ -0,0 +1,32 @@ +package com.yxt.sms.biz.smssalesbill; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/8/5 17:24 + */ +@Data +public class PrintPdfVo { + + + private String company; //分公司 + private String dept; //部门 + private String billNo; //单据编号 + private String mobile; //联系电话 + private String customer; //客户名称 + private String vinNo; //车架号 + private String vehMark; //车牌号 + private String isKp; //是否开票 + private String nowDate; //打印日期 + private String caps; //维修用料合计大写 + private String amountTotal; //维修用料合计 + private List goods = new ArrayList<>(); + private String userName; //经办人 + + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index a958344b50..fba58f54c4 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -22,14 +22,8 @@ public class SalesGoodsVo { private String goodsSpuName; //商品编码（图号） private String goodsSkuCode; - //规格型号 - private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - @ApiModelProperty("仓库名称") - private String warehouseName; - //库位编号 - private String warehouseRackCode; @ApiModelProperty("出/退库数量") private String count; @ApiModelProperty("销售价（元）") @@ -50,4 +44,26 @@ public class SalesGoodsVo { @ApiModelProperty("商品ID") private String goodsID; // 商品ID + //规格型号 + private String goodsSkuOwnSpec; + //仓库Sid + private String warehouseSid; + //仓库 + private String warehouseName; + //库区sid + private String areaSid; + //库区 + private String areaName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //供应商sid + private String billObjSid; + //供应商 + private String billObjName; + //销售价常量 + private String goodsDetailsPrice; + //是否含税（0含税，1不含税） + private String isTaxRate; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java index c2e61eab16..d91ea7ed28 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java @@ -26,6 +26,7 @@ public class SalesInvoiceVo { private String invoiceCode; // 发票号码 @ApiModelProperty("税率") private String taxRate; // 税率 - + @ApiModelProperty("开票单位sid") + private String invoiceTitleSid; // 开票单位sid } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java index 5ab3f2fcab..6e1eeac88b 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java @@ -18,5 +18,7 @@ public class SmsAttachitemVo { private String price; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("销售价常量") + private String aitemPrice; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index 56846dc0a3..82cfed5387 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -101,23 +101,29 @@