From 91d901b96c66e5b99639872ce9d27a2989099533 Mon Sep 17 00:00:00 2001 From: ling li <709673163@qq.com> Date: Mon, 10 Jul 2023 08:39:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=B0=86=E6=95=B0=E5=AD=97=E9=83=A8=E5=88=86=E5=89=8D=E4=B8=A4?= =?UTF-8?q?=E4=BD=8D=E5=88=A0=E9=99=A4=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=81=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=8D=95=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E9=83=A8=E5=88=86=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeliveryGoodsNoticeServiceImpl.java | 2 +- .../MaterialRequisitionInfoServiceImpl.java | 10 +- ...housingFinishProductNoticeServiceImpl.java | 2 +- .../impl/WorkOrderInfoServiceImpl.java | 2 +- .../OutsourceInspectionNoticeServiceImpl.java | 2 +- .../impl/OutsourceOrderInfoServiceImpl.java | 2 +- .../impl/PurchaseOrderServiceImpl.java | 2 +- .../ReturnGoodsKhthScInfoServiceImpl.java | 4 +- .../impl/ReturnGoodsOrderServiceImpl.java | 2 +- .../rfMsg/domain/VnaRawDataKeyValue.java | 36 - .../SalesOrderDetailController.java | 159 +++- .../ruoyi/sales/domain/SalesOrderDetail.java | 198 ++-- .../domain/exportDto/SalesOrderDetailDto.java | 858 ++++++++++++++++++ .../sales/mapper/SalesOrderDetailMapper.java | 41 +- .../service/ISalesOrderDetailService.java | 53 +- .../impl/SalesOrderDetailServiceImpl.java | 51 +- .../controller/OutboundInfoController.java | 45 +- .../impl/WarehousingCheckInfoServiceImpl.java | 2 +- .../impl/WarehousingInInfoServiceImpl.java | 12 +- ...arehousingInspectionNoticeServiceImpl.java | 4 +- .../ruoyi/system/domain/SysSalesOrder.java | 12 +- .../impl/SysProductQuotationServiceImpl.java | 2 +- .../SysQutsourcingQuotationServiceImpl.java | 2 +- .../impl/SysSalesOrderServiceImpl.java | 2 +- .../impl/SysSupplierQuotationServiceImpl.java | 2 +- .../FinanceRequestFundsController.java | 131 +++ .../domain/FinanceRequestFunds.java | 649 +++++++++++++ .../mapper/FinanceRequestFundsMapper.java | 61 ++ .../service/IFinanceRequestFundsService.java | 61 ++ .../impl/FinanceRequestFundsServiceImpl.java | 94 ++ .../mapper/sales/SalesOrderDetail.xml | 250 ----- .../mapper/sales/SalesOrderDetailMapper.xml | 344 +++++++ .../resources/mapper/system/SysSopMapper.xml | 68 +- .../taxInvoice/FinanceRequestFundsMapper.xml | 245 +++++ .../deliveryGoodsNotice.html | 6 +- .../purchaseAccountReconciliation.html | 2 + .../templates/sales/salesOrderDetail/add.html | 134 +-- .../sales/salesOrderDetail/edit.html | 136 +-- .../salesOrderDetail/salesOrderDetail.html | 708 ++++++++------- .../storehouse/warehousingCheckInfo/edit.html | 1 + .../resources/templates/system/sop/sop.html | 48 +- .../taxInvoice/financeRequestFunds/add.html | 420 +++++++++ .../taxInvoice/financeRequestFunds/edit.html | 396 ++++++++ .../financeRequestFunds.html | 406 +++++++++ .../framework/aspectj/DataSourceAspect.class | Bin 2775 -> 2771 bytes .../ruoyi/framework/config/ShiroConfig.class | Bin 11860 -> 11856 bytes 46 files changed, 4670 insertions(+), 997 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/sales/domain/exportDto/SalesOrderDetailDto.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/FinanceRequestFundsController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/FinanceRequestFunds.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/FinanceRequestFundsMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IFinanceRequestFundsService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/FinanceRequestFundsServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java index e0b49d96..4d34e3e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java @@ -97,6 +97,6 @@ public class DeliveryGoodsNoticeServiceImpl implements IDeliveryGoodsNoticeServi @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "SCP" + time; + return "SCP" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java index 32f33ae3..f32121e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java @@ -117,26 +117,26 @@ public class MaterialRequisitionInfoServiceImpl implements IMaterialRequisitionI @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "WLLL" + time; + return "WLLL" + time.substring(2); } @Override public String getRawId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "YLLL" + time; + return "YLLL" + time.substring(2); } @Override public String getSubsidiaryId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "FLLL" + time; + return "FLLL" + time.substring(2); } @Override public String getBcpId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CPLL" + time; + return "CPLL" + time.substring(2); } @Override public String getOutsourceId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "OWLL" + time; + return "OWLL" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java index 7bad8efa..2699c76e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java @@ -97,7 +97,7 @@ public class WarehousingFinishProductNoticeServiceImpl implements IWarehousingFi @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "IVCP" + time; + return "IVCP" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WorkOrderInfoServiceImpl.java index 9ba53cdb..1873ba7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WorkOrderInfoServiceImpl.java @@ -97,6 +97,6 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "WO" + time; + return "WO" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java index 3f84c5e8..d4b1629d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java @@ -97,6 +97,6 @@ public class OutsourceInspectionNoticeServiceImpl implements IOutsourceInspectio @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "QCWOI" + time; + return "QCWOI" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java index efcc2146..38348a66 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java @@ -97,6 +97,6 @@ public class OutsourceOrderInfoServiceImpl implements IOutsourceOrderInfoService @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "OP" + time; + return "OP" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index 30343a8a..2948bf23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -97,6 +97,6 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "PO" + time; + return "PO" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsKhthScInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsKhthScInfoServiceImpl.java index c659610e..d63fe0ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsKhthScInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsKhthScInfoServiceImpl.java @@ -107,11 +107,11 @@ public class ReturnGoodsKhthScInfoServiceImpl implements IReturnGoodsKhthScInfoS @Override public String getKhthId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "KHTH" + time; + return "KHTH" + time.substring(2); } @Override public String getScId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "SC" + time; + return "SC" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsOrderServiceImpl.java index a8d0713d..b0a764c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsOrderServiceImpl.java @@ -121,6 +121,6 @@ public class ReturnGoodsOrderServiceImpl implements IReturnGoodsOrderService @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "RHO" + time; + return "RHO" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java b/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java deleted file mode 100644 index 66d36e23..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ruoyi.rfMsg.domain; - -import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; - -public class VnaRawDataKeyValue extends BaseEntity { - private static final long serialVersionUID = 1L; - - private String key; - - private String value; - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("key", key) - .append("value", value) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java index cc500ff0..7ca644f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java @@ -1,28 +1,48 @@ package com.ruoyi.sales.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.util.MapUtils; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.fill.FillConfig; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.manufacture.domain.DeliveryGoodsDetail; +import com.ruoyi.manufacture.domain.WorkOrderInfo; +import com.ruoyi.manufacture.service.IDeliveryGoodsDetailService; +import com.ruoyi.manufacture.service.IWorkOrderInfoService; import com.ruoyi.sales.domain.SalesOrderDetail; +import com.ruoyi.sales.domain.exportDto.SalesOrderDetailDto; import com.ruoyi.sales.service.ISalesOrderDetailService; -import com.ruoyi.system.domain.SysCustomer; -import com.ruoyi.system.service.ISysCustomerService; +import com.ruoyi.system.service.ISysDictTypeService; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.Map; + +import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; /** - * 销售订单记录Controller + * 销售订单查询Controller * * @author ruoyi - * @date 2023-02-03 + * @date 2023-07-05 */ @Controller @RequestMapping("/sales/salesOrderDetail") @@ -32,9 +52,13 @@ public class SalesOrderDetailController extends BaseController @Autowired private ISalesOrderDetailService salesOrderDetailService; + @Autowired + private IDeliveryGoodsDetailService deliveryGoodsDetailService; + @Autowired + private IWorkOrderInfoService workOrderInfoService; @Autowired - private ISysCustomerService customerService; + private ISysDictTypeService sysDictTypeService; @RequiresPermissions("sales:salesOrderDetail:view") @GetMapping() @@ -44,7 +68,7 @@ public class SalesOrderDetailController extends BaseController } /** - * 查询销售订单记录列表 + * 查询销售订单查询列表 */ @RequiresPermissions("sales:salesOrderDetail:list") @PostMapping("/list") @@ -57,21 +81,21 @@ public class SalesOrderDetailController extends BaseController } /** - * 导出销售订单记录列表 + * 导出销售订单查询列表 */ @RequiresPermissions("sales:salesOrderDetail:export") - @Log(title = "销售订单记录", businessType = BusinessType.EXPORT) + @Log(title = "销售订单查询", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody public AjaxResult export(SalesOrderDetail salesOrderDetail) { List list = salesOrderDetailService.selectSalesOrderDetailList(salesOrderDetail); ExcelUtil util = new ExcelUtil(SalesOrderDetail.class); - return util.exportExcel(list, "销售订单记录数据"); + return util.exportExcel(list, "销售订单查询数据"); } /** - * 新增销售订单记录 + * 新增销售订单查询 */ @GetMapping("/add") public String add() @@ -80,10 +104,10 @@ public class SalesOrderDetailController extends BaseController } /** - * 新增保存销售订单记录 + * 新增保存销售订单查询 */ @RequiresPermissions("sales:salesOrderDetail:add") - @Log(title = "销售订单记录", businessType = BusinessType.INSERT) + @Log(title = "销售订单查询", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody public AjaxResult addSave(SalesOrderDetail salesOrderDetail) @@ -92,21 +116,21 @@ public class SalesOrderDetailController extends BaseController } /** - * 修改销售订单记录 + * 修改销售订单查询 */ - @GetMapping("/edit/{salesOrderCode}") - public String edit(@PathVariable("salesOrderCode") String salesOrderCode, ModelMap mmap) + @GetMapping("/edit/{salesFinishId}") + public String edit(@PathVariable("salesFinishId") Long salesFinishId, ModelMap mmap) { - SalesOrderDetail salesOrderDetail = salesOrderDetailService.selectSalesOrderDetailById(salesOrderCode); + SalesOrderDetail salesOrderDetail = salesOrderDetailService.selectSalesOrderDetailById(salesFinishId); mmap.put("salesOrderDetail", salesOrderDetail); return prefix + "/edit"; } /** - * 修改保存销售订单记录 + * 修改保存销售订单查询 */ @RequiresPermissions("sales:salesOrderDetail:edit") - @Log(title = "销售订单记录", businessType = BusinessType.UPDATE) + @Log(title = "销售订单查询", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody public AjaxResult editSave(SalesOrderDetail salesOrderDetail) @@ -115,10 +139,10 @@ public class SalesOrderDetailController extends BaseController } /** - * 删除销售订单记录 + * 删除销售订单查询 */ @RequiresPermissions("sales:salesOrderDetail:remove") - @Log(title = "销售订单记录", businessType = BusinessType.DELETE) + @Log(title = "销售订单查询", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody public AjaxResult remove(String ids) @@ -126,11 +150,96 @@ public class SalesOrderDetailController extends BaseController return toAjax(salesOrderDetailService.deleteSalesOrderDetailByIds(ids)); } - //获取客户信息 - @PostMapping("/getCustomerList") + + /** + * 导出销售订单查询列表 + */ + @RequiresPermissions("sales:salesOrderDetail:export") + @Log(title = "销售订单查询", businessType = BusinessType.EXPORT) + @PostMapping("/exportDatas/{ids}") @ResponseBody - public List getCustomerList(SysCustomer customer) { - List list = customerService.selectSysCustomerList(customer); - return list; + public void exportDatas(@PathVariable("ids") String ids, HttpServletResponse response, HttpServletRequest request) throws IOException { + + String startTime = request.getParameter("startTime").trim(); + String endTime = request.getParameter("endTime").trim(); + String salesOrderNumber = request.getParameter("salesOrderNumber").trim(); + String enterpriseName = request.getParameter("enterpriseName").trim(); + String orderReceivingMode = request.getParameter("orderReceivingMode").trim(); + String finishProductCode = request.getParameter("finishProductCode").trim(); + String finishProductName = request.getParameter("finishProductName").trim(); + String commonCurrency = request.getParameter("commonCurrency").trim(); + String[] idsStr = ids.split(","); + List salesOrderDetailDtoList =new ArrayList<>(); + List salesOrderDetailList =new ArrayList<>(); + for (int i = 0; i < idsStr.length; i++) { + SalesOrderDetail salesOrderDetail = salesOrderDetailService.selectSalesOrderDetailById(Long.valueOf(idsStr[i])); + salesOrderDetailList.add(salesOrderDetail); + } + try { + Iterator values = salesOrderDetailList.iterator(); + while (values.hasNext()) { + Object source = values.next(); + SalesOrderDetail salesOrderDetail1 = (SalesOrderDetail) source; + SalesOrderDetailDto target = SalesOrderDetailDto.class.newInstance(); + BeanUtils.copyProperties(source, target); + List sysCommonCurrencyData = sysDictTypeService.selectDictDataByType("sys_common_currency"); + for (int i = 0;i deliveryGoodsDetailList = deliveryGoodsDetailService.selectDeliveryGoodsDetailList(deliveryGoodsDetail); + if (deliveryGoodsDetailList.size() > 0) { + if (deliveryGoodsDetailList.get(0).getProductQuantity().equals("") || deliveryGoodsDetailList.get(0).getProductQuantity().equals(null)) { + target.setDeliveryQuantity(String.valueOf(0)); + target.setUnDeliveryQuantity(String.valueOf(Float.valueOf(productQuantity1)-0)); + } else { + target.setDeliveryQuantity(deliveryGoodsDetailList.get(0).getProductQuantity()); + target.setUnDeliveryQuantity(String.valueOf(Float.valueOf(productQuantity1)-Float.valueOf(deliveryGoodsDetailList.get(0).getProductQuantity()))); + } + } + //制工单 + WorkOrderInfo workOrderInfo = new WorkOrderInfo(); + workOrderInfo.setSalesOrderNumber(salesOrderNumber1); + workOrderInfo.setFinishProductCode(finishProductCode1); + List workOrderInfoList = workOrderInfoService.selectWorkOrderInfoList(workOrderInfo); + if (workOrderInfoList.size() > 0) { + target.setBeginOrderQuantity(workOrderInfoList.get(0).getBeginOrderQuantity()); + target.setNotBeginOrderQuantity(workOrderInfoList.get(0).getNotBeginOrderQuantity()); + } + salesOrderDetailDtoList.add(target); + } + } catch (Exception e) { + log.error(">>>>>>异常<<<<<<", e); + } + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode("订单查询明细", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + String templateFileName = "C:\\exportTemplates\\exportSalesOrderDetail.xlsx"; + try (ExcelWriter excelWriter = EasyExcel + .write(response.getOutputStream(), SalesOrderDetailDto.class) + .withTemplate(templateFileName) + .build()) { + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + excelWriter.fill(salesOrderDetailDtoList, fillConfig, writeSheet); + Map map = MapUtils.newHashMap(); + map.put("startTime", startTime); + map.put("endTime", endTime); + map.put("salesOrderNumber", salesOrderNumber); + map.put("enterpriseName", enterpriseName); + map.put("orderReceivingMode", orderReceivingMode); + map.put("finishProductCode", finishProductCode); + map.put("finishProductName", finishProductName); + map.put("commonCurrency", commonCurrency); + excelWriter.fill(map, writeSheet); + } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java index ab52313b..c49b78bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java @@ -1,25 +1,22 @@ package com.ruoyi.sales.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; /** - * 销售订单记录对象 sales_account_reconciliation + * 销售订单查询对象 sales_order_detail * * @author ruoyi - * @date 2023-02-03 + * @date 2023-07-05 */ public class SalesOrderDetail extends BaseEntity { private static final long serialVersionUID = 1L; - - /** 订单id */ - @Excel(name = "订单id") - private String salesFinishId; + private Long salesFinishId; /** 订单编号 */ @Excel(name = "订单编号") @@ -29,10 +26,6 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "订单号码") private String salesOrderNumber; - /** 预约单号 */ - @Excel(name = "预约单号") - private String appointmentNumber; - /** 客户代码 */ @Excel(name = "客户代码") private String enterpriseCode; @@ -129,6 +122,10 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "确认日期") private String confirmTime; + /** 文件存储 */ + @Excel(name = "文件存储") + private String fileUpload; + /** 确认否 */ @Excel(name = "确认否") private String confirmNo; @@ -137,20 +134,20 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "确认人") private String confirmName; - /** 审核否 */ - @Excel(name = "审核否") + /** 结案否 */ + @Excel(name = "结案否") private String auditNo; - /** 审核人 */ - @Excel(name = "审核人") + /** 结案人 */ + @Excel(name = "结案人") private String auditName; - /** 审核时间 */ - @Excel(name = "审核时间") + /** 结案时间 */ + @Excel(name = "结案时间") private String auditTime; - /** 审核备注 */ - @Excel(name = "审核备注") + /** 结案备注 */ + @Excel(name = "结案备注") private String auditRemarks; /** 是否开国税发票 */ @@ -169,6 +166,10 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "规格型号") private String specificationModel; + /** 客户料号 */ + @Excel(name = "客户料号") + private String customerNumber; + /** 机种 */ @Excel(name = "机种") private String typeMachine; @@ -181,6 +182,10 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "重量") private String stockUnitWeight; + /** 币别 */ + @Excel(name = "币别") + private String commonCurrency; + /** 单价 */ @Excel(name = "单价") private String processPrice; @@ -233,15 +238,16 @@ public class SalesOrderDetail extends BaseEntity @Excel(name = "对账时间") private String accountReconciliationTime; - public String getSalesFinishId() { - return salesFinishId; - } - - public void setSalesFinishId(String salesFinishId) { + public void setSalesFinishId(Long salesFinishId) + { this.salesFinishId = salesFinishId; } - public void setSalesOrderCode(String salesOrderCode) + public Long getSalesFinishId() + { + return salesFinishId; + } + public void setSalesOrderCode(String salesOrderCode) { this.salesOrderCode = salesOrderCode; } @@ -259,15 +265,6 @@ public class SalesOrderDetail extends BaseEntity { return salesOrderNumber; } - public void setAppointmentNumber(String appointmentNumber) - { - this.appointmentNumber = appointmentNumber; - } - - public String getAppointmentNumber() - { - return appointmentNumber; - } public void setEnterpriseCode(String enterpriseCode) { this.enterpriseCode = enterpriseCode; @@ -484,6 +481,15 @@ public class SalesOrderDetail extends BaseEntity { return confirmTime; } + public void setFileUpload(String fileUpload) + { + this.fileUpload = fileUpload; + } + + public String getFileUpload() + { + return fileUpload; + } public void setConfirmNo(String confirmNo) { this.confirmNo = confirmNo; @@ -538,42 +544,6 @@ public class SalesOrderDetail extends BaseEntity { return auditRemarks; } - public void setCustomerUseOrNot(String customerUseOrNot) - { - this.customerUseOrNot = customerUseOrNot; - } - - public String getCustomerUseOrNot() - { - return customerUseOrNot; - } - public void setAccountReconciliationOrNot(String accountReconciliationOrNot) - { - this.accountReconciliationOrNot = accountReconciliationOrNot; - } - - public String getAccountReconciliationOrNot() - { - return accountReconciliationOrNot; - } - public void setAccountReconciliationPerson(String accountReconciliationPerson) - { - this.accountReconciliationPerson = accountReconciliationPerson; - } - - public String getAccountReconciliationPerson() - { - return accountReconciliationPerson; - } - public void setAccountReconciliationTime(String accountReconciliationTime) - { - this.accountReconciliationTime = accountReconciliationTime; - } - - public String getAccountReconciliationTime() - { - return accountReconciliationTime; - } public void setNationalTaxBill(String nationalTaxBill) { this.nationalTaxBill = nationalTaxBill; @@ -610,6 +580,15 @@ public class SalesOrderDetail extends BaseEntity { return specificationModel; } + public void setCustomerNumber(String customerNumber) + { + this.customerNumber = customerNumber; + } + + public String getCustomerNumber() + { + return customerNumber; + } public void setTypeMachine(String typeMachine) { this.typeMachine = typeMachine; @@ -637,6 +616,15 @@ public class SalesOrderDetail extends BaseEntity { return stockUnitWeight; } + public void setCommonCurrency(String commonCurrency) + { + this.commonCurrency = commonCurrency; + } + + public String getCommonCurrency() + { + return commonCurrency; + } public void setProcessPrice(String processPrice) { this.processPrice = processPrice; @@ -700,21 +688,59 @@ public class SalesOrderDetail extends BaseEntity { return salesExplain; } - - public String getCustomerUseQuantity() { - return customerUseQuantity; + public void setCustomerUseOrNot(String customerUseOrNot) + { + this.customerUseOrNot = customerUseOrNot; } - public void setCustomerUseQuantity(String customerUseQuantity) { + public String getCustomerUseOrNot() + { + return customerUseOrNot; + } + public void setCustomerUseQuantity(String customerUseQuantity) + { this.customerUseQuantity = customerUseQuantity; } - public String getCustomerUseRemarks() { + public String getCustomerUseQuantity() + { + return customerUseQuantity; + } + public void setCustomerUseRemarks(String customerUseRemarks) + { + this.customerUseRemarks = customerUseRemarks; + } + + public String getCustomerUseRemarks() + { return customerUseRemarks; } + public void setAccountReconciliationOrNot(String accountReconciliationOrNot) + { + this.accountReconciliationOrNot = accountReconciliationOrNot; + } - public void setCustomerUseRemarks(String customerUseRemarks) { - this.customerUseRemarks = customerUseRemarks; + public String getAccountReconciliationOrNot() + { + return accountReconciliationOrNot; + } + public void setAccountReconciliationPerson(String accountReconciliationPerson) + { + this.accountReconciliationPerson = accountReconciliationPerson; + } + + public String getAccountReconciliationPerson() + { + return accountReconciliationPerson; + } + public void setAccountReconciliationTime(String accountReconciliationTime) + { + this.accountReconciliationTime = accountReconciliationTime; + } + + public String getAccountReconciliationTime() + { + return accountReconciliationTime; } @Override @@ -723,7 +749,6 @@ public class SalesOrderDetail extends BaseEntity .append("salesFinishId", getSalesFinishId()) .append("salesOrderCode", getSalesOrderCode()) .append("salesOrderNumber", getSalesOrderNumber()) - .append("appointmentNumber", getAppointmentNumber()) .append("enterpriseCode", getEnterpriseCode()) .append("enterpriseName", getEnterpriseName()) .append("paymentTerms", getPaymentTerms()) @@ -748,25 +773,22 @@ public class SalesOrderDetail extends BaseEntity .append("totalAmount", getTotalAmount()) .append("modificationTime", getModificationTime()) .append("confirmTime", getConfirmTime()) + .append("fileUpload", getFileUpload()) .append("confirmNo", getConfirmNo()) .append("confirmName", getConfirmName()) .append("auditNo", getAuditNo()) .append("auditName", getAuditName()) .append("auditTime", getAuditTime()) .append("auditRemarks", getAuditRemarks()) - .append("customerUseOrNot", getCustomerUseOrNot()) - .append("customerUseQuantity", getCustomerUseQuantity()) - .append("customerUseRemarks", getCustomerUseRemarks()) - .append("accountReconciliationOrNot", getAccountReconciliationOrNot()) - .append("accountReconciliationPerson", getAccountReconciliationPerson()) - .append("accountReconciliationTime", getAccountReconciliationTime()) .append("nationalTaxBill", getNationalTaxBill()) .append("finishProductCode", getFinishProductCode()) .append("finishProductName", getFinishProductName()) .append("specificationModel", getSpecificationModel()) + .append("customerNumber", getCustomerNumber()) .append("typeMachine", getTypeMachine()) .append("inventoryUnit", getInventoryUnit()) .append("stockUnitWeight", getStockUnitWeight()) + .append("commonCurrency", getCommonCurrency()) .append("processPrice", getProcessPrice()) .append("productQuantity", getProductQuantity()) .append("amountMoney", getAmountMoney()) @@ -774,6 +796,12 @@ public class SalesOrderDetail extends BaseEntity .append("line", getLine()) .append("versionNumber", getVersionNumber()) .append("salesExplain", getSalesExplain()) + .append("customerUseOrNot", getCustomerUseOrNot()) + .append("customerUseQuantity", getCustomerUseQuantity()) + .append("customerUseRemarks", getCustomerUseRemarks()) + .append("accountReconciliationOrNot", getAccountReconciliationOrNot()) + .append("accountReconciliationPerson", getAccountReconciliationPerson()) + .append("accountReconciliationTime", getAccountReconciliationTime()) .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/exportDto/SalesOrderDetailDto.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/exportDto/SalesOrderDetailDto.java new file mode 100644 index 00000000..730a781d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/exportDto/SalesOrderDetailDto.java @@ -0,0 +1,858 @@ +package com.ruoyi.sales.domain.exportDto; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; + +/** + * 销售订单查询对象 sales_order_detail + * + * @author ruoyi + * @date 2023-07-05 + */ +public class SalesOrderDetailDto extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 订单id */ + private Long salesFinishId; + + /** 订单编号 */ + @ExcelProperty("订单编号") + private String salesOrderCode; + + /** 订单号码 */ + @ExcelProperty("订单号码") + private String salesOrderNumber; + + /** 客户代码 */ + @ExcelProperty("客户代码") + private String enterpriseCode; + + /** 客户名称 */ + @ExcelProperty("客户名称") + private String enterpriseName; + + /** 付款条件 */ + @ExcelProperty("付款条件") + private String paymentTerms; + + /** 交货条件 */ + @ExcelProperty("交货条件") + private String deliveryConditions; + + /** 交货方式 */ + @ExcelProperty("交货方式") + private String deliveryMethod; + + /** 接单方式 */ + @ExcelProperty("接单方式") + private String orderReceivingMode; + + /** 联系人 */ + @ExcelProperty("联系人") + private String customerContact; + + /** 客户厂区 */ + @ExcelProperty("客户厂区") + private String customerFactory; + + /** 联系电话 */ + @ExcelProperty("联系电话") + private String contactNumber; + + /** 业务人员 */ + @ExcelProperty("业务人员") + private String businessMembers; + + /** 传真号码 */ + @ExcelProperty("传真号码") + private String customerFax; + + /** 交货地点 */ + @ExcelProperty("交货地点") + private String deliveryAddress; + + /** 接单日期 */ + @ExcelProperty("接单日期") + private String orderReceivingTime; + + /** 开单日期时间 */ + @ExcelProperty("开单日期时间") + private String billingTime; + + /** 备注内容 */ + @ExcelProperty("备注内容") + private String customerRemarks; + + /** 当前库存数 */ + @ExcelProperty("当前库存数") + private String currentInventory; + + /** 信用额度 */ + @ExcelProperty("信用额度") + private String creditLimit; + + /** 未付款数 */ + @ExcelProperty("未付款数") + private String unpaidAmount; + + /** 可用额度 */ + @ExcelProperty("可用额度") + private String availableCredit; + + /** 是否含税 */ + @ExcelProperty("是否含税") + private String confirmTax; + + /** 税率 */ + @ExcelProperty("税率") + private String taxRate; + + /** 合计金额 */ + @ExcelProperty("合计金额") + private String totalAmount; + + /** 修改日期 */ + @ExcelProperty("修改日期") + private String modificationTime; + + /** 确认日期 */ + @ExcelProperty("确认日期") + private String confirmTime; + + /** 文件存储 */ + @ExcelProperty("文件存储") + private String fileUpload; + + /** 确认否 */ + @ExcelProperty("确认否") + private String confirmNo; + + /** 确认人 */ + @ExcelProperty("确认人") + private String confirmName; + + /** 结案否 */ + @ExcelProperty("结案否") + private String auditNo; + + /** 结案人 */ + @ExcelProperty("结案人") + private String auditName; + + /** 结案时间 */ + @ExcelProperty("结案时间") + private String auditTime; + + /** 结案备注 */ + @ExcelProperty("结案备注") + private String auditRemarks; + + /** 是否开国税发票 */ + @ExcelProperty("是否开国税发票") + private String nationalTaxBill; + + /** 成品代码 */ + @ExcelProperty("成品代码") + private String finishProductCode; + + /** 成品名称 */ + @ExcelProperty("成品名称") + private String finishProductName; + + /** 规格型号 */ + @ExcelProperty("规格型号") + private String specificationModel; + + /** 客户料号 */ + @ExcelProperty("客户料号") + private String customerNumber; + + /** 机种 */ + @ExcelProperty("机种") + private String typeMachine; + + /** 单位 */ + @ExcelProperty("单位") + private String inventoryUnit; + + /** 重量 */ + @ExcelProperty("重量") + private String stockUnitWeight; + + /** 币别 */ + @ExcelProperty("币别") + private String commonCurrency; + + /** 单价 */ + @ExcelProperty("单价") + private String processPrice; + + /** 数量 */ + @ExcelProperty("数量") + private String productQuantity; + + /** 金额 */ + @ExcelProperty("金额") + private String amountMoney; + + /** 交期 */ + @ExcelProperty("交期") + private String deliveryTime; + + /** Line# */ + @ExcelProperty("Line#") + private String line; + + /** 版本号 */ + @ExcelProperty("版本号") + private String versionNumber; + + /** 说明 */ + @ExcelProperty("说明") + private String salesExplain; + + /** 客户使用否 */ + @ExcelProperty("客户使用否") + private String customerUseOrNot; + + /** 客户使用数量 */ + @ExcelProperty("客户使用数量") + private String customerUseQuantity; + + /** 客户使用备注说明 */ + @ExcelProperty("客户使用备注说明") + private String customerUseRemarks; + + /** 对账否 */ + @ExcelProperty("对账否") + private String accountReconciliationOrNot; + + /** 对账人 */ + @ExcelProperty("对账人") + private String accountReconciliationPerson; + + /** 对账时间 */ + @ExcelProperty("对账时间") + private String accountReconciliationTime; + + /** 已交货数 */ + @ExcelProperty("已交货数") + private String deliveryQuantity; + + /** 未交货数 */ + @ExcelProperty("未交货数") + private String unDeliveryQuantity; + + /** 已下工单数 */ + @ExcelProperty("已下工单数") + private String beginOrderQuantity; + + /** 欠工单数 */ + @ExcelProperty("欠工单数") + private String notBeginOrderQuantity; + + public void setSalesFinishId(Long salesFinishId) + { + this.salesFinishId = salesFinishId; + } + + public Long getSalesFinishId() + { + return salesFinishId; + } + public void setSalesOrderCode(String salesOrderCode) + { + this.salesOrderCode = salesOrderCode; + } + + public String getSalesOrderCode() + { + return salesOrderCode; + } + public void setSalesOrderNumber(String salesOrderNumber) + { + this.salesOrderNumber = salesOrderNumber; + } + + public String getSalesOrderNumber() + { + return salesOrderNumber; + } + public void setEnterpriseCode(String enterpriseCode) + { + this.enterpriseCode = enterpriseCode; + } + + public String getEnterpriseCode() + { + return enterpriseCode; + } + public void setEnterpriseName(String enterpriseName) + { + this.enterpriseName = enterpriseName; + } + + public String getEnterpriseName() + { + return enterpriseName; + } + public void setPaymentTerms(String paymentTerms) + { + this.paymentTerms = paymentTerms; + } + + public String getPaymentTerms() + { + return paymentTerms; + } + public void setDeliveryConditions(String deliveryConditions) + { + this.deliveryConditions = deliveryConditions; + } + + public String getDeliveryConditions() + { + return deliveryConditions; + } + public void setDeliveryMethod(String deliveryMethod) + { + this.deliveryMethod = deliveryMethod; + } + + public String getDeliveryMethod() + { + return deliveryMethod; + } + public void setOrderReceivingMode(String orderReceivingMode) + { + this.orderReceivingMode = orderReceivingMode; + } + + public String getOrderReceivingMode() + { + return orderReceivingMode; + } + public void setCustomerContact(String customerContact) + { + this.customerContact = customerContact; + } + + public String getCustomerContact() + { + return customerContact; + } + public void setCustomerFactory(String customerFactory) + { + this.customerFactory = customerFactory; + } + + public String getCustomerFactory() + { + return customerFactory; + } + public void setContactNumber(String contactNumber) + { + this.contactNumber = contactNumber; + } + + public String getContactNumber() + { + return contactNumber; + } + public void setBusinessMembers(String businessMembers) + { + this.businessMembers = businessMembers; + } + + public String getBusinessMembers() + { + return businessMembers; + } + public void setCustomerFax(String customerFax) + { + this.customerFax = customerFax; + } + + public String getCustomerFax() + { + return customerFax; + } + public void setDeliveryAddress(String deliveryAddress) + { + this.deliveryAddress = deliveryAddress; + } + + public String getDeliveryAddress() + { + return deliveryAddress; + } + public void setOrderReceivingTime(String orderReceivingTime) + { + this.orderReceivingTime = orderReceivingTime; + } + + public String getOrderReceivingTime() + { + return orderReceivingTime; + } + public void setBillingTime(String billingTime) + { + this.billingTime = billingTime; + } + + public String getBillingTime() + { + return billingTime; + } + public void setCustomerRemarks(String customerRemarks) + { + this.customerRemarks = customerRemarks; + } + + public String getCustomerRemarks() + { + return customerRemarks; + } + public void setCurrentInventory(String currentInventory) + { + this.currentInventory = currentInventory; + } + + public String getCurrentInventory() + { + return currentInventory; + } + public void setCreditLimit(String creditLimit) + { + this.creditLimit = creditLimit; + } + + public String getCreditLimit() + { + return creditLimit; + } + public void setUnpaidAmount(String unpaidAmount) + { + this.unpaidAmount = unpaidAmount; + } + + public String getUnpaidAmount() + { + return unpaidAmount; + } + public void setAvailableCredit(String availableCredit) + { + this.availableCredit = availableCredit; + } + + public String getAvailableCredit() + { + return availableCredit; + } + public void setConfirmTax(String confirmTax) + { + this.confirmTax = confirmTax; + } + + public String getConfirmTax() + { + return confirmTax; + } + public void setTaxRate(String taxRate) + { + this.taxRate = taxRate; + } + + public String getTaxRate() + { + return taxRate; + } + public void setTotalAmount(String totalAmount) + { + this.totalAmount = totalAmount; + } + + public String getTotalAmount() + { + return totalAmount; + } + public void setModificationTime(String modificationTime) + { + this.modificationTime = modificationTime; + } + + public String getModificationTime() + { + return modificationTime; + } + public void setConfirmTime(String confirmTime) + { + this.confirmTime = confirmTime; + } + + public String getConfirmTime() + { + return confirmTime; + } + public void setFileUpload(String fileUpload) + { + this.fileUpload = fileUpload; + } + + public String getFileUpload() + { + return fileUpload; + } + public void setConfirmNo(String confirmNo) + { + this.confirmNo = confirmNo; + } + + public String getConfirmNo() + { + return confirmNo; + } + public void setConfirmName(String confirmName) + { + this.confirmName = confirmName; + } + + public String getConfirmName() + { + return confirmName; + } + public void setAuditNo(String auditNo) + { + this.auditNo = auditNo; + } + + public String getAuditNo() + { + return auditNo; + } + public void setAuditName(String auditName) + { + this.auditName = auditName; + } + + public String getAuditName() + { + return auditName; + } + public void setAuditTime(String auditTime) + { + this.auditTime = auditTime; + } + + public String getAuditTime() + { + return auditTime; + } + public void setAuditRemarks(String auditRemarks) + { + this.auditRemarks = auditRemarks; + } + + public String getAuditRemarks() + { + return auditRemarks; + } + public void setNationalTaxBill(String nationalTaxBill) + { + this.nationalTaxBill = nationalTaxBill; + } + + public String getNationalTaxBill() + { + return nationalTaxBill; + } + public void setFinishProductCode(String finishProductCode) + { + this.finishProductCode = finishProductCode; + } + + public String getFinishProductCode() + { + return finishProductCode; + } + public void setFinishProductName(String finishProductName) + { + this.finishProductName = finishProductName; + } + + public String getFinishProductName() + { + return finishProductName; + } + public void setSpecificationModel(String specificationModel) + { + this.specificationModel = specificationModel; + } + + public String getSpecificationModel() + { + return specificationModel; + } + public void setCustomerNumber(String customerNumber) + { + this.customerNumber = customerNumber; + } + + public String getCustomerNumber() + { + return customerNumber; + } + public void setTypeMachine(String typeMachine) + { + this.typeMachine = typeMachine; + } + + public String getTypeMachine() + { + return typeMachine; + } + public void setInventoryUnit(String inventoryUnit) + { + this.inventoryUnit = inventoryUnit; + } + + public String getInventoryUnit() + { + return inventoryUnit; + } + public void setStockUnitWeight(String stockUnitWeight) + { + this.stockUnitWeight = stockUnitWeight; + } + + public String getStockUnitWeight() + { + return stockUnitWeight; + } + public void setCommonCurrency(String commonCurrency) + { + this.commonCurrency = commonCurrency; + } + + public String getCommonCurrency() + { + return commonCurrency; + } + public void setProcessPrice(String processPrice) + { + this.processPrice = processPrice; + } + + public String getProcessPrice() + { + return processPrice; + } + public void setProductQuantity(String productQuantity) + { + this.productQuantity = productQuantity; + } + + public String getProductQuantity() + { + return productQuantity; + } + public void setAmountMoney(String amountMoney) + { + this.amountMoney = amountMoney; + } + + public String getAmountMoney() + { + return amountMoney; + } + public void setDeliveryTime(String deliveryTime) + { + this.deliveryTime = deliveryTime; + } + + public String getDeliveryTime() + { + return deliveryTime; + } + public void setLine(String line) + { + this.line = line; + } + + public String getLine() + { + return line; + } + public void setVersionNumber(String versionNumber) + { + this.versionNumber = versionNumber; + } + + public String getVersionNumber() + { + return versionNumber; + } + public void setSalesExplain(String salesExplain) + { + this.salesExplain = salesExplain; + } + + public String getSalesExplain() + { + return salesExplain; + } + public void setCustomerUseOrNot(String customerUseOrNot) + { + this.customerUseOrNot = customerUseOrNot; + } + + public String getCustomerUseOrNot() + { + return customerUseOrNot; + } + public void setCustomerUseQuantity(String customerUseQuantity) + { + this.customerUseQuantity = customerUseQuantity; + } + + public String getCustomerUseQuantity() + { + return customerUseQuantity; + } + public void setCustomerUseRemarks(String customerUseRemarks) + { + this.customerUseRemarks = customerUseRemarks; + } + + public String getCustomerUseRemarks() + { + return customerUseRemarks; + } + public void setAccountReconciliationOrNot(String accountReconciliationOrNot) + { + this.accountReconciliationOrNot = accountReconciliationOrNot; + } + + public String getAccountReconciliationOrNot() + { + return accountReconciliationOrNot; + } + public void setAccountReconciliationPerson(String accountReconciliationPerson) + { + this.accountReconciliationPerson = accountReconciliationPerson; + } + + public String getAccountReconciliationPerson() + { + return accountReconciliationPerson; + } + public void setAccountReconciliationTime(String accountReconciliationTime) + { + this.accountReconciliationTime = accountReconciliationTime; + } + + public String getAccountReconciliationTime() + { + return accountReconciliationTime; + } + + public String getDeliveryQuantity() { + return deliveryQuantity; + } + + public void setDeliveryQuantity(String deliveryQuantity) { + this.deliveryQuantity = deliveryQuantity; + } + + public String getUnDeliveryQuantity() { + return unDeliveryQuantity; + } + + public void setUnDeliveryQuantity(String unDeliveryQuantity) { + this.unDeliveryQuantity = unDeliveryQuantity; + } + + public String getBeginOrderQuantity() { + return beginOrderQuantity; + } + + public void setBeginOrderQuantity(String beginOrderQuantity) { + this.beginOrderQuantity = beginOrderQuantity; + } + + public String getNotBeginOrderQuantity() { + return notBeginOrderQuantity; + } + + public void setNotBeginOrderQuantity(String notBeginOrderQuantity) { + this.notBeginOrderQuantity = notBeginOrderQuantity; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("salesFinishId", salesFinishId) + .append("salesOrderCode", salesOrderCode) + .append("salesOrderNumber", salesOrderNumber) + .append("enterpriseCode", enterpriseCode) + .append("enterpriseName", enterpriseName) + .append("paymentTerms", paymentTerms) + .append("deliveryConditions", deliveryConditions) + .append("deliveryMethod", deliveryMethod) + .append("orderReceivingMode", orderReceivingMode) + .append("customerContact", customerContact) + .append("customerFactory", customerFactory) + .append("contactNumber", contactNumber) + .append("businessMembers", businessMembers) + .append("customerFax", customerFax) + .append("deliveryAddress", deliveryAddress) + .append("orderReceivingTime", orderReceivingTime) + .append("billingTime", billingTime) + .append("customerRemarks", customerRemarks) + .append("currentInventory", currentInventory) + .append("creditLimit", creditLimit) + .append("unpaidAmount", unpaidAmount) + .append("availableCredit", availableCredit) + .append("confirmTax", confirmTax) + .append("taxRate", taxRate) + .append("totalAmount", totalAmount) + .append("modificationTime", modificationTime) + .append("confirmTime", confirmTime) + .append("fileUpload", fileUpload) + .append("confirmNo", confirmNo) + .append("confirmName", confirmName) + .append("auditNo", auditNo) + .append("auditName", auditName) + .append("auditTime", auditTime) + .append("auditRemarks", auditRemarks) + .append("nationalTaxBill", nationalTaxBill) + .append("finishProductCode", finishProductCode) + .append("finishProductName", finishProductName) + .append("specificationModel", specificationModel) + .append("customerNumber", customerNumber) + .append("typeMachine", typeMachine) + .append("inventoryUnit", inventoryUnit) + .append("stockUnitWeight", stockUnitWeight) + .append("commonCurrency", commonCurrency) + .append("processPrice", processPrice) + .append("productQuantity", productQuantity) + .append("amountMoney", amountMoney) + .append("deliveryTime", deliveryTime) + .append("line", line) + .append("versionNumber", versionNumber) + .append("salesExplain", salesExplain) + .append("customerUseOrNot", customerUseOrNot) + .append("customerUseQuantity", customerUseQuantity) + .append("customerUseRemarks", customerUseRemarks) + .append("accountReconciliationOrNot", accountReconciliationOrNot) + .append("accountReconciliationPerson", accountReconciliationPerson) + .append("accountReconciliationTime", accountReconciliationTime) + .append("deliveryQuantity", deliveryQuantity) + .append("unDeliveryQuantity", unDeliveryQuantity) + .append("beginOrderQuantity", beginOrderQuantity) + .append("notBeginOrderQuantity", notBeginOrderQuantity) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java index 752e6b88..a6625d65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java @@ -1,62 +1,61 @@ package com.ruoyi.sales.mapper; -import com.ruoyi.sales.domain.SalesOrderDetail; - import java.util.List; +import com.ruoyi.sales.domain.SalesOrderDetail; /** - * 销售订单记录Mapper接口 + * 销售订单查询Mapper接口 * * @author ruoyi - * @date 2023-02-03 + * @date 2023-07-05 */ public interface SalesOrderDetailMapper { /** - * 查询销售订单记录 + * 查询销售订单查询 * - * @param salesOrderCode 销售订单记录ID - * @return 销售订单记录 + * @param salesFinishId 销售订单查询ID + * @return 销售订单查询 */ - public SalesOrderDetail selectSalesOrderDetailById(String salesOrderCode); + public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId); /** - * 查询销售订单记录列表 + * 查询销售订单查询列表 * - * @param salesOrderDetail 销售订单记录 - * @return 销售订单记录集合 + * @param salesOrderDetail 销售订单查询 + * @return 销售订单查询集合 */ public List selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail); /** - * 新增销售订单记录 + * 新增销售订单查询 * - * @param salesOrderDetail 销售订单记录 + * @param salesOrderDetail 销售订单查询 * @return 结果 */ public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail); /** - * 修改销售订单记录 + * 修改销售订单查询 * - * @param salesOrderDetail 销售订单记录 + * @param salesOrderDetail 销售订单查询 * @return 结果 */ public int updateSalesOrderDetail(SalesOrderDetail salesOrderDetail); /** - * 删除销售订单记录 + * 删除销售订单查询 * - * @param salesOrderCode 销售订单记录ID + * @param salesFinishId 销售订单查询ID * @return 结果 */ - public int deleteSalesOrderDetailById(String salesOrderCode); + public int deleteSalesOrderDetailById(Long salesFinishId); /** - * 批量删除销售订单记录 + * 批量删除销售订单查询 * - * @param salesOrderCodes 需要删除的数据ID + * @param salesFinishIds 需要删除的数据ID * @return 结果 */ - public int deleteSalesOrderDetailByIds(String[] salesOrderCodes); + public int deleteSalesOrderDetailByIds(String[] salesFinishIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java index 1a7518cf..8457ac6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java @@ -1,62 +1,61 @@ package com.ruoyi.sales.service; -import com.ruoyi.sales.domain.SalesOrderDetail; - import java.util.List; +import com.ruoyi.sales.domain.SalesOrderDetail; /** - * 销售订单记录Service接口 - * + * 销售订单查询Service接口 + * * @author ruoyi - * @date 2023-02-03 + * @date 2023-07-05 */ -public interface ISalesOrderDetailService +public interface ISalesOrderDetailService { /** - * 查询销售订单记录 - * - * @param salesOrderCode 销售订单记录ID - * @return 销售订单记录 + * 查询销售订单查询 + * + * @param salesFinishId 销售订单查询ID + * @return 销售订单查询 */ - public SalesOrderDetail selectSalesOrderDetailById(String salesOrderCode); + public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId); /** - * 查询销售订单记录列表 - * - * @param salesOrderDetail 销售订单记录 - * @return 销售订单记录集合 + * 查询销售订单查询列表 + * + * @param salesOrderDetail 销售订单查询 + * @return 销售订单查询集合 */ public List selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail); /** - * 新增销售订单记录 - * - * @param salesOrderDetail 销售订单记录 + * 新增销售订单查询 + * + * @param salesOrderDetail 销售订单查询 * @return 结果 */ public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail); /** - * 修改销售订单记录 - * - * @param salesOrderDetail 销售订单记录 + * 修改销售订单查询 + * + * @param salesOrderDetail 销售订单查询 * @return 结果 */ public int updateSalesOrderDetail(SalesOrderDetail salesOrderDetail); /** - * 批量删除销售订单记录 - * + * 批量删除销售订单查询 + * * @param ids 需要删除的数据ID * @return 结果 */ public int deleteSalesOrderDetailByIds(String ids); /** - * 删除销售订单记录信息 - * - * @param salesOrderCode 销售订单记录ID + * 删除销售订单查询信息 + * + * @param salesFinishId 销售订单查询ID * @return 结果 */ - public int deleteSalesOrderDetailById(String salesOrderCode); + public int deleteSalesOrderDetailById(Long salesFinishId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java index 1892e5b1..5732afad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java @@ -1,43 +1,42 @@ package com.ruoyi.sales.service.impl; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.sales.domain.SalesOrderDetail; -import com.ruoyi.sales.mapper.SalesOrderDetailMapper; -import com.ruoyi.sales.service.ISalesOrderDetailService; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.util.List; +import com.ruoyi.sales.mapper.SalesOrderDetailMapper; +import com.ruoyi.sales.domain.SalesOrderDetail; +import com.ruoyi.sales.service.ISalesOrderDetailService; +import com.ruoyi.common.core.text.Convert; /** - * 销售订单记录Service业务层处理 + * 销售订单查询Service业务层处理 * * @author ruoyi - * @date 2023-02-03 + * @date 2023-07-05 */ @Service -public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService +public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService { @Autowired private SalesOrderDetailMapper salesOrderDetailMapper; /** - * 查询销售订单记录 + * 查询销售订单查询 * - * @param salesOrderCode 销售订单记录ID - * @return 销售订单记录 + * @param salesFinishId 销售订单查询ID + * @return 销售订单查询 */ @Override - public SalesOrderDetail selectSalesOrderDetailById(String salesOrderCode) + public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId) { - return salesOrderDetailMapper.selectSalesOrderDetailById(salesOrderCode); + return salesOrderDetailMapper.selectSalesOrderDetailById(salesFinishId); } /** - * 查询销售订单记录列表 + * 查询销售订单查询列表 * - * @param salesOrderDetail 销售订单记录 - * @return 销售订单记录 + * @param salesOrderDetail 销售订单查询 + * @return 销售订单查询 */ @Override public List selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail) @@ -46,9 +45,9 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService } /** - * 新增销售订单记录 + * 新增销售订单查询 * - * @param salesOrderDetail 销售订单记录 + * @param salesOrderDetail 销售订单查询 * @return 结果 */ @Override @@ -58,9 +57,9 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService } /** - * 修改销售订单记录 + * 修改销售订单查询 * - * @param salesOrderDetail 销售订单记录 + * @param salesOrderDetail 销售订单查询 * @return 结果 */ @Override @@ -70,7 +69,7 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService } /** - * 删除销售订单记录对象 + * 删除销售订单查询对象 * * @param ids 需要删除的数据ID * @return 结果 @@ -82,14 +81,14 @@ public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService } /** - * 删除销售订单记录信息 + * 删除销售订单查询信息 * - * @param salesOrderCode 销售订单记录ID + * @param salesFinishId 销售订单查询ID * @return 结果 */ @Override - public int deleteSalesOrderDetailById(String salesOrderCode) + public int deleteSalesOrderDetailById(Long salesFinishId) { - return salesOrderDetailMapper.deleteSalesOrderDetailById(salesOrderCode); + return salesOrderDetailMapper.deleteSalesOrderDetailById(salesFinishId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundInfoController.java index a17f7ce5..574e089a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundInfoController.java @@ -1,35 +1,27 @@ package com.ruoyi.storehouse.controller; -import java.io.IOException; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; -import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import com.alibaba.excel.write.metadata.style.WriteFont; -import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.ruoyi.ck.utils.Result; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.storehouse.domain.OutboundDetail; +import com.ruoyi.storehouse.domain.OutboundInfo; import com.ruoyi.storehouse.domain.exportDto.OutboundDetailDto; import com.ruoyi.storehouse.domain.exportDto.OutboundInfoDto; import com.ruoyi.storehouse.service.IOutboundDetailService; +import com.ruoyi.storehouse.service.IOutboundInfoService; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.service.ISysCustomerService; -import com.ruoyi.system.service.impl.SysCustomerServiceImpl; import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,16 +30,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.storehouse.domain.OutboundInfo; -import com.ruoyi.storehouse.service.IOutboundInfoService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * outboundInfoController @@ -478,20 +469,20 @@ public class OutboundInfoController extends BaseController @ResponseBody public Result getOutNoYL() throws Exception { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return Result.getSuccessResult("YLOUT"+time); + return Result.getSuccessResult("YLOUT"+time.substring(2)); } @PostMapping("/getOutNoFL") @ResponseBody public Result getOutNoFL() throws Exception { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return Result.getSuccessResult("FLOUT"+time); + return Result.getSuccessResult("FLOUT"+time.substring(2)); } @PostMapping("/getOutNoCP") @ResponseBody public Result getOutNoCP() throws Exception { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return Result.getSuccessResult("CPOUT"+time); + return Result.getSuccessResult("CPOUT"+time.substring(2)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java index e7471ece..3011cd62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java @@ -97,6 +97,6 @@ public class WarehousingCheckInfoServiceImpl implements IWarehousingCheckInfoSer @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CH" + time; + return "CH" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java index 16895d9d..696981c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java @@ -128,31 +128,31 @@ public class WarehousingInInfoServiceImpl implements IWarehousingInInfoService @Override public String getRawId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "YLIN" + time; + return "YLIN" + time.substring(2); } @Override public String getSubsidiaryId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "FLIN" + time; + return "FLIN" + time.substring(2); } @Override public String getFinishProductId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "POCP" + time; + return "POCP" + time.substring(2); } @Override public String getRGFinishProductId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CPRI" + time; + return "CPRI" + time.substring(2); } @Override public String getPDFinishProductId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CPIN" + time; + return "CPIN" + time.substring(2); } @Override public String getPDBcpId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "YLIN" + time; + return "YLIN" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java index 5d43a086..493f3a49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java @@ -119,11 +119,11 @@ public class WarehousingInspectionNoticeServiceImpl implements IWarehousingInspe @Override public String getIdYL() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "IQC" + time; + return "IQC" + time.substring(2); } @Override public String getIdFL() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "PQCFL" + time; + return "PQCFL" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index 5c3eea1b..b7dc752d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -146,20 +146,20 @@ public class SysSalesOrder extends BaseEntity @Excel(name = "备用一") private String standbyOne; - /** 审核人 */ - @Excel(name = "审核人") + /** 结案人 */ + @Excel(name = "结案人") private String auditName; /** 备用二 */ @Excel(name = "备用二") private String standbyTwo; - /** 审核时间 */ - @Excel(name = "审核时间") + /** 结案时间 */ + @Excel(name = "结案时间") private String auditTime; - /** 审核备注 */ - @Excel(name = "审核备注") + /** 结案备注 */ + @Excel(name = "结案备注") private String auditRemarks; /** 客户使用否 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java index 86111f4e..fd3c651f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java @@ -97,6 +97,6 @@ public class SysProductQuotationServiceImpl implements ISysProductQuotationServi @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "BJ" + time; + return "BJ" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysQutsourcingQuotationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysQutsourcingQuotationServiceImpl.java index 12811685..e2da30e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysQutsourcingQuotationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysQutsourcingQuotationServiceImpl.java @@ -97,6 +97,6 @@ public class SysQutsourcingQuotationServiceImpl implements ISysQutsourcingQuotat @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "BJ" + time; + return "BJ" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index ce9fc061..327e9545 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -97,6 +97,6 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "SO" + time; + return "SO" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java index 8a5e13d3..ba70de35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java @@ -97,6 +97,6 @@ public class SysSupplierQuotationServiceImpl implements ISysSupplierQuotationSer @Override public String getId() { String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "BJ" + time; + return "BJ" + time.substring(2); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/FinanceRequestFundsController.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/FinanceRequestFundsController.java new file mode 100644 index 00000000..9af60cc8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/FinanceRequestFundsController.java @@ -0,0 +1,131 @@ +package com.ruoyi.taxInvoice.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.taxInvoice.domain.FinanceRequestFunds; +import com.ruoyi.taxInvoice.service.IFinanceRequestFundsService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.List; + +/** + * 付款申请单Controller + * + * @author ruoyi + * @date 2023-07-06 + */ +@Controller +@RequestMapping("/taxInvoice/financeRequestFunds") +public class FinanceRequestFundsController extends BaseController +{ + private String prefix = "taxInvoice/financeRequestFunds"; + + @Autowired + private IFinanceRequestFundsService financeRequestFundsService; + + @RequiresPermissions("taxInvoice:financeRequestFunds:view") + @GetMapping() + public String financeRequestFunds() + { + return prefix + "/financeRequestFunds"; + } + + /** + * 查询付款申请单列表 + */ + @RequiresPermissions("taxInvoice:financeRequestFunds:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(FinanceRequestFunds financeRequestFunds) + { + startPage(); + List list = financeRequestFundsService.selectFinanceRequestFundsList(financeRequestFunds); + return getDataTable(list); + } + + /** + * 导出付款申请单列表 + */ + @RequiresPermissions("taxInvoice:financeRequestFunds:export") + @Log(title = "付款申请单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(FinanceRequestFunds financeRequestFunds) + { + List list = financeRequestFundsService.selectFinanceRequestFundsList(financeRequestFunds); + ExcelUtil util = new ExcelUtil(FinanceRequestFunds.class); + return util.exportExcel(list, "付款申请单数据"); + } + + /** + * 新增付款申请单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存付款申请单 + */ + @RequiresPermissions("taxInvoice:financeRequestFunds:add") + @Log(title = "付款申请单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(FinanceRequestFunds financeRequestFunds) + { + return toAjax(financeRequestFundsService.insertFinanceRequestFunds(financeRequestFunds)); + } + + /** + * 修改付款申请单 + */ + @GetMapping("/edit/{requestFundsId}") + public String edit(@PathVariable("requestFundsId") Integer requestFundsId, ModelMap mmap) + { + FinanceRequestFunds financeRequestFunds = financeRequestFundsService.selectFinanceRequestFundsById(requestFundsId); + mmap.put("financeRequestFunds", financeRequestFunds); + return prefix + "/edit"; + } + + /** + * 修改保存付款申请单 + */ + @RequiresPermissions("taxInvoice:financeRequestFunds:edit") + @Log(title = "付款申请单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(FinanceRequestFunds financeRequestFunds) + { + return toAjax(financeRequestFundsService.updateFinanceRequestFunds(financeRequestFunds)); + } + + /** + * 删除付款申请单 + */ + @RequiresPermissions("taxInvoice:financeRequestFunds:remove") + @Log(title = "付款申请单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(financeRequestFundsService.deleteFinanceRequestFundsByIds(ids)); + } + + @PostMapping( "/getId") + @ResponseBody + public String getId() { + String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); + return "FK" + time.substring(2); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/FinanceRequestFunds.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/FinanceRequestFunds.java new file mode 100644 index 00000000..b4243c3c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/FinanceRequestFunds.java @@ -0,0 +1,649 @@ +package com.ruoyi.taxInvoice.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 付款申请单对象 finance_request_funds + * + * @author ruoyi + * @date 2023-07-06 + */ +public class FinanceRequestFunds extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 请款id */ + private Integer requestFundsId; + + /** 申请单号 */ + @Excel(name = "申请单号") + private String requestFundsNumber; + + /** 申请日期时间 */ + @Excel(name = "申请日期时间") + private String requestFundsTime; + + /** 币别 */ + @Excel(name = "币别") + private String commonCurrency; + + /** 申请人 */ + @Excel(name = "申请人") + private String requestPerson; + + /** 约定付款期限 */ + @Excel(name = "约定付款期限") + private String agreedPaymentDeadline; + + /** 厂商代码 */ + @Excel(name = "厂商代码") + private String supplierCode; + + /** 厂商名称 */ + @Excel(name = "厂商名称") + private String supplierName; + + /** 开户银行 */ + @Excel(name = "开户银行") + private String depositBank; + + /** 银行账号 */ + @Excel(name = "银行账号") + private String bankAccount; + + /** 款项所属期 */ + @Excel(name = "款项所属期") + private String periodOfPayment; + + /** 请款源由类别 */ + @Excel(name = "请款源由类别") + private String requestReasonCategory; + + /** 请款部门 */ + @Excel(name = "请款部门") + private String requestFundsDept; + + /** 发票类别 */ + @Excel(name = "发票类别") + private String invoiceCategory; + + /** 付款条件 */ + @Excel(name = "付款条件") + private String paymentTerms; + + /** 付款方式 */ + @Excel(name = "付款方式") + private String paymentWay; + + /** 请款金额合计 */ + @Excel(name = "请款金额合计") + private String requestAmountTotal; + + /** 本月请款合计 */ + @Excel(name = "本月请款合计") + private String monthRequestTotal; + + /** 金额（大写） */ + @Excel(name = "金额", readConverterExp = "大=写") + private String amountUppercase; + + /** 付款事项 */ + @Excel(name = "付款事项") + private String paymentMatters; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 主管审批否 */ + @Excel(name = "主管审批否") + private String supervisorApprovalFlag; + + /** 审批主管名 */ + @Excel(name = "审批主管名") + private String supervisorApproval; + + /** 主管审批时间 */ + @Excel(name = "主管审批时间") + private String supervisorApprovalTime; + + /** 财务主管审批否 */ + @Excel(name = "财务主管审批否") + private String finanaceSupervisorApprovalFlag; + + /** 审批财务主管名 */ + @Excel(name = "审批财务主管名") + private String finanaceSupervisorApproval; + + /** 财务主管审批时间 */ + @Excel(name = "财务主管审批时间") + private String finanaceSupervisorApprovalTime; + + /** 副总经理审批否 */ + @Excel(name = "副总经理审批否") + private String deputyGeneralManagerApprovalFlag; + + /** 审批副总经理名 */ + @Excel(name = "审批副总经理名") + private String deputyGeneralManagerApproval; + + /** 副总经理审批时间 */ + @Excel(name = "副总经理审批时间") + private String deputyGeneralManagerApprovalTime; + + /** 总经理审批否 */ + @Excel(name = "总经理审批否") + private String generalManagerApprovalFlag; + + /** 审批总经理名 */ + @Excel(name = "审批总经理名") + private String generalManagerApproval; + + /** 总经理审批时间 */ + @Excel(name = "总经理审批时间") + private String generalManagerApprovalTime; + + /** 出纳付完否 */ + @Excel(name = "出纳付完否") + private String paidAccountingCashierFlag; + + /** 已付款会计出纳 */ + @Excel(name = "已付款会计出纳") + private String paidAccountingCashier; + + /** 付款完时间 */ + @Excel(name = "付款完时间") + private String paymentCompletionTime; + + /** 实付金额 */ + @Excel(name = "实付金额") + private String paidInAmount; + + /** 扣款金额 */ + @Excel(name = "扣款金额") + private String deductionAmount; + + /** 结案否 */ + @Excel(name = "结案否") + private String closeCaseFlag; + + /** 录入时间 */ + @Excel(name = "录入时间") + private String firstAddTime; + + /** 修改时间 */ + @Excel(name = "修改时间") + private String updateInfoTime; + + /** 备用一 */ + private String standbyOne; + + /** 备用二 */ + private String standbyTwo; + + /** 备用三 */ + private String standbyThree; + + /** 备用四 */ + private String standbyFour; + + public void setRequestFundsId(Integer requestFundsId) + { + this.requestFundsId = requestFundsId; + } + + public Integer getRequestFundsId() + { + return requestFundsId; + } + public void setRequestFundsNumber(String requestFundsNumber) + { + this.requestFundsNumber = requestFundsNumber; + } + + public String getRequestFundsNumber() + { + return requestFundsNumber; + } + public void setRequestFundsTime(String requestFundsTime) + { + this.requestFundsTime = requestFundsTime; + } + + public String getRequestFundsTime() + { + return requestFundsTime; + } + public void setCommonCurrency(String commonCurrency) + { + this.commonCurrency = commonCurrency; + } + + public String getCommonCurrency() + { + return commonCurrency; + } + public void setRequestPerson(String requestPerson) + { + this.requestPerson = requestPerson; + } + + public String getRequestPerson() + { + return requestPerson; + } + public void setAgreedPaymentDeadline(String agreedPaymentDeadline) + { + this.agreedPaymentDeadline = agreedPaymentDeadline; + } + + public String getAgreedPaymentDeadline() + { + return agreedPaymentDeadline; + } + public void setSupplierCode(String supplierCode) + { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() + { + return supplierCode; + } + public void setSupplierName(String supplierName) + { + this.supplierName = supplierName; + } + + public String getSupplierName() + { + return supplierName; + } + public void setDepositBank(String depositBank) + { + this.depositBank = depositBank; + } + + public String getDepositBank() + { + return depositBank; + } + public void setBankAccount(String bankAccount) + { + this.bankAccount = bankAccount; + } + + public String getBankAccount() + { + return bankAccount; + } + public void setPeriodOfPayment(String periodOfPayment) + { + this.periodOfPayment = periodOfPayment; + } + + public String getPeriodOfPayment() + { + return periodOfPayment; + } + public void setRequestReasonCategory(String requestReasonCategory) + { + this.requestReasonCategory = requestReasonCategory; + } + + public String getRequestReasonCategory() + { + return requestReasonCategory; + } + public void setRequestFundsDept(String requestFundsDept) + { + this.requestFundsDept = requestFundsDept; + } + + public String getRequestFundsDept() + { + return requestFundsDept; + } + public void setInvoiceCategory(String invoiceCategory) + { + this.invoiceCategory = invoiceCategory; + } + + public String getInvoiceCategory() + { + return invoiceCategory; + } + public void setPaymentTerms(String paymentTerms) + { + this.paymentTerms = paymentTerms; + } + + public String getPaymentTerms() + { + return paymentTerms; + } + public void setPaymentWay(String paymentWay) + { + this.paymentWay = paymentWay; + } + + public String getPaymentWay() + { + return paymentWay; + } + public void setRequestAmountTotal(String requestAmountTotal) + { + this.requestAmountTotal = requestAmountTotal; + } + + public String getRequestAmountTotal() + { + return requestAmountTotal; + } + public void setMonthRequestTotal(String monthRequestTotal) + { + this.monthRequestTotal = monthRequestTotal; + } + + public String getMonthRequestTotal() + { + return monthRequestTotal; + } + public void setAmountUppercase(String amountUppercase) + { + this.amountUppercase = amountUppercase; + } + + public String getAmountUppercase() + { + return amountUppercase; + } + public void setPaymentMatters(String paymentMatters) + { + this.paymentMatters = paymentMatters; + } + + public String getPaymentMatters() + { + return paymentMatters; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setSupervisorApprovalFlag(String supervisorApprovalFlag) + { + this.supervisorApprovalFlag = supervisorApprovalFlag; + } + + public String getSupervisorApprovalFlag() + { + return supervisorApprovalFlag; + } + public void setSupervisorApproval(String supervisorApproval) + { + this.supervisorApproval = supervisorApproval; + } + + public String getSupervisorApproval() + { + return supervisorApproval; + } + public void setSupervisorApprovalTime(String supervisorApprovalTime) + { + this.supervisorApprovalTime = supervisorApprovalTime; + } + + public String getSupervisorApprovalTime() + { + return supervisorApprovalTime; + } + public void setFinanaceSupervisorApprovalFlag(String finanaceSupervisorApprovalFlag) + { + this.finanaceSupervisorApprovalFlag = finanaceSupervisorApprovalFlag; + } + + public String getFinanaceSupervisorApprovalFlag() + { + return finanaceSupervisorApprovalFlag; + } + public void setFinanaceSupervisorApproval(String finanaceSupervisorApproval) + { + this.finanaceSupervisorApproval = finanaceSupervisorApproval; + } + + public String getFinanaceSupervisorApproval() + { + return finanaceSupervisorApproval; + } + public void setFinanaceSupervisorApprovalTime(String finanaceSupervisorApprovalTime) + { + this.finanaceSupervisorApprovalTime = finanaceSupervisorApprovalTime; + } + + public String getFinanaceSupervisorApprovalTime() + { + return finanaceSupervisorApprovalTime; + } + public void setDeputyGeneralManagerApprovalFlag(String deputyGeneralManagerApprovalFlag) + { + this.deputyGeneralManagerApprovalFlag = deputyGeneralManagerApprovalFlag; + } + + public String getDeputyGeneralManagerApprovalFlag() + { + return deputyGeneralManagerApprovalFlag; + } + public void setDeputyGeneralManagerApproval(String deputyGeneralManagerApproval) + { + this.deputyGeneralManagerApproval = deputyGeneralManagerApproval; + } + + public String getDeputyGeneralManagerApproval() + { + return deputyGeneralManagerApproval; + } + public void setDeputyGeneralManagerApprovalTime(String deputyGeneralManagerApprovalTime) + { + this.deputyGeneralManagerApprovalTime = deputyGeneralManagerApprovalTime; + } + + public String getDeputyGeneralManagerApprovalTime() + { + return deputyGeneralManagerApprovalTime; + } + public void setGeneralManagerApprovalFlag(String generalManagerApprovalFlag) + { + this.generalManagerApprovalFlag = generalManagerApprovalFlag; + } + + public String getGeneralManagerApprovalFlag() + { + return generalManagerApprovalFlag; + } + public void setGeneralManagerApproval(String generalManagerApproval) + { + this.generalManagerApproval = generalManagerApproval; + } + + public String getGeneralManagerApproval() + { + return generalManagerApproval; + } + public void setGeneralManagerApprovalTime(String generalManagerApprovalTime) + { + this.generalManagerApprovalTime = generalManagerApprovalTime; + } + + public String getGeneralManagerApprovalTime() + { + return generalManagerApprovalTime; + } + public void setPaidAccountingCashierFlag(String paidAccountingCashierFlag) + { + this.paidAccountingCashierFlag = paidAccountingCashierFlag; + } + + public String getPaidAccountingCashierFlag() + { + return paidAccountingCashierFlag; + } + public void setPaidAccountingCashier(String paidAccountingCashier) + { + this.paidAccountingCashier = paidAccountingCashier; + } + + public String getPaidAccountingCashier() + { + return paidAccountingCashier; + } + public void setPaymentCompletionTime(String paymentCompletionTime) + { + this.paymentCompletionTime = paymentCompletionTime; + } + + public String getPaymentCompletionTime() + { + return paymentCompletionTime; + } + public void setPaidInAmount(String paidInAmount) + { + this.paidInAmount = paidInAmount; + } + + public String getPaidInAmount() + { + return paidInAmount; + } + public void setDeductionAmount(String deductionAmount) + { + this.deductionAmount = deductionAmount; + } + + public String getDeductionAmount() + { + return deductionAmount; + } + public void setCloseCaseFlag(String closeCaseFlag) + { + this.closeCaseFlag = closeCaseFlag; + } + + public String getCloseCaseFlag() + { + return closeCaseFlag; + } + public void setFirstAddTime(String firstAddTime) + { + this.firstAddTime = firstAddTime; + } + + public String getFirstAddTime() + { + return firstAddTime; + } + public void setUpdateInfoTime(String updateInfoTime) + { + this.updateInfoTime = updateInfoTime; + } + + public String getUpdateInfoTime() + { + return updateInfoTime; + } + public void setStandbyOne(String standbyOne) + { + this.standbyOne = standbyOne; + } + + public String getStandbyOne() + { + return standbyOne; + } + public void setStandbyTwo(String standbyTwo) + { + this.standbyTwo = standbyTwo; + } + + public String getStandbyTwo() + { + return standbyTwo; + } + public void setStandbyThree(String standbyThree) + { + this.standbyThree = standbyThree; + } + + public String getStandbyThree() + { + return standbyThree; + } + public void setStandbyFour(String standbyFour) + { + this.standbyFour = standbyFour; + } + + public String getStandbyFour() + { + return standbyFour; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("requestFundsId", getRequestFundsId()) + .append("requestFundsNumber", getRequestFundsNumber()) + .append("requestFundsTime", getRequestFundsTime()) + .append("commonCurrency", getCommonCurrency()) + .append("requestPerson", getRequestPerson()) + .append("agreedPaymentDeadline", getAgreedPaymentDeadline()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("depositBank", getDepositBank()) + .append("bankAccount", getBankAccount()) + .append("periodOfPayment", getPeriodOfPayment()) + .append("requestReasonCategory", getRequestReasonCategory()) + .append("requestFundsDept", getRequestFundsDept()) + .append("invoiceCategory", getInvoiceCategory()) + .append("paymentTerms", getPaymentTerms()) + .append("paymentWay", getPaymentWay()) + .append("requestAmountTotal", getRequestAmountTotal()) + .append("monthRequestTotal", getMonthRequestTotal()) + .append("amountUppercase", getAmountUppercase()) + .append("paymentMatters", getPaymentMatters()) + .append("remarks", getRemarks()) + .append("supervisorApprovalFlag", getSupervisorApprovalFlag()) + .append("supervisorApproval", getSupervisorApproval()) + .append("supervisorApprovalTime", getSupervisorApprovalTime()) + .append("finanaceSupervisorApprovalFlag", getFinanaceSupervisorApprovalFlag()) + .append("finanaceSupervisorApproval", getFinanaceSupervisorApproval()) + .append("finanaceSupervisorApprovalTime", getFinanaceSupervisorApprovalTime()) + .append("deputyGeneralManagerApprovalFlag", getDeputyGeneralManagerApprovalFlag()) + .append("deputyGeneralManagerApproval", getDeputyGeneralManagerApproval()) + .append("deputyGeneralManagerApprovalTime", getDeputyGeneralManagerApprovalTime()) + .append("generalManagerApprovalFlag", getGeneralManagerApprovalFlag()) + .append("generalManagerApproval", getGeneralManagerApproval()) + .append("generalManagerApprovalTime", getGeneralManagerApprovalTime()) + .append("paidAccountingCashierFlag", getPaidAccountingCashierFlag()) + .append("paidAccountingCashier", getPaidAccountingCashier()) + .append("paymentCompletionTime", getPaymentCompletionTime()) + .append("paidInAmount", getPaidInAmount()) + .append("deductionAmount", getDeductionAmount()) + .append("closeCaseFlag", getCloseCaseFlag()) + .append("firstAddTime", getFirstAddTime()) + .append("updateInfoTime", getUpdateInfoTime()) + .append("standbyOne", getStandbyOne()) + .append("standbyTwo", getStandbyTwo()) + .append("standbyThree", getStandbyThree()) + .append("standbyFour", getStandbyFour()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/FinanceRequestFundsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/FinanceRequestFundsMapper.java new file mode 100644 index 00000000..c6113ca5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/FinanceRequestFundsMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.taxInvoice.mapper; + +import java.util.List; +import com.ruoyi.taxInvoice.domain.FinanceRequestFunds; + +/** + * 付款申请单Mapper接口 + * + * @author ruoyi + * @date 2023-07-06 + */ +public interface FinanceRequestFundsMapper +{ + /** + * 查询付款申请单 + * + * @param requestFundsId 付款申请单ID + * @return 付款申请单 + */ + public FinanceRequestFunds selectFinanceRequestFundsById(Integer requestFundsId); + + /** + * 查询付款申请单列表 + * + * @param financeRequestFunds 付款申请单 + * @return 付款申请单集合 + */ + public List selectFinanceRequestFundsList(FinanceRequestFunds financeRequestFunds); + + /** + * 新增付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + public int insertFinanceRequestFunds(FinanceRequestFunds financeRequestFunds); + + /** + * 修改付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + public int updateFinanceRequestFunds(FinanceRequestFunds financeRequestFunds); + + /** + * 删除付款申请单 + * + * @param requestFundsId 付款申请单ID + * @return 结果 + */ + public int deleteFinanceRequestFundsById(Integer requestFundsId); + + /** + * 批量删除付款申请单 + * + * @param requestFundsIds 需要删除的数据ID + * @return 结果 + */ + public int deleteFinanceRequestFundsByIds(String[] requestFundsIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IFinanceRequestFundsService.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IFinanceRequestFundsService.java new file mode 100644 index 00000000..6ed24055 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IFinanceRequestFundsService.java @@ -0,0 +1,61 @@ +package com.ruoyi.taxInvoice.service; + +import java.util.List; +import com.ruoyi.taxInvoice.domain.FinanceRequestFunds; + +/** + * 付款申请单Service接口 + * + * @author ruoyi + * @date 2023-07-06 + */ +public interface IFinanceRequestFundsService +{ + /** + * 查询付款申请单 + * + * @param requestFundsId 付款申请单ID + * @return 付款申请单 + */ + public FinanceRequestFunds selectFinanceRequestFundsById(Integer requestFundsId); + + /** + * 查询付款申请单列表 + * + * @param financeRequestFunds 付款申请单 + * @return 付款申请单集合 + */ + public List selectFinanceRequestFundsList(FinanceRequestFunds financeRequestFunds); + + /** + * 新增付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + public int insertFinanceRequestFunds(FinanceRequestFunds financeRequestFunds); + + /** + * 修改付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + public int updateFinanceRequestFunds(FinanceRequestFunds financeRequestFunds); + + /** + * 批量删除付款申请单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteFinanceRequestFundsByIds(String ids); + + /** + * 删除付款申请单信息 + * + * @param requestFundsId 付款申请单ID + * @return 结果 + */ + public int deleteFinanceRequestFundsById(Integer requestFundsId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/FinanceRequestFundsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/FinanceRequestFundsServiceImpl.java new file mode 100644 index 00000000..5aa2aff9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/FinanceRequestFundsServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.taxInvoice.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.taxInvoice.mapper.FinanceRequestFundsMapper; +import com.ruoyi.taxInvoice.domain.FinanceRequestFunds; +import com.ruoyi.taxInvoice.service.IFinanceRequestFundsService; +import com.ruoyi.common.core.text.Convert; + +/** + * 付款申请单Service业务层处理 + * + * @author ruoyi + * @date 2023-07-06 + */ +@Service +public class FinanceRequestFundsServiceImpl implements IFinanceRequestFundsService +{ + @Autowired + private FinanceRequestFundsMapper financeRequestFundsMapper; + + /** + * 查询付款申请单 + * + * @param requestFundsId 付款申请单ID + * @return 付款申请单 + */ + @Override + public FinanceRequestFunds selectFinanceRequestFundsById(Integer requestFundsId) + { + return financeRequestFundsMapper.selectFinanceRequestFundsById(requestFundsId); + } + + /** + * 查询付款申请单列表 + * + * @param financeRequestFunds 付款申请单 + * @return 付款申请单 + */ + @Override + public List selectFinanceRequestFundsList(FinanceRequestFunds financeRequestFunds) + { + return financeRequestFundsMapper.selectFinanceRequestFundsList(financeRequestFunds); + } + + /** + * 新增付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + @Override + public int insertFinanceRequestFunds(FinanceRequestFunds financeRequestFunds) + { + return financeRequestFundsMapper.insertFinanceRequestFunds(financeRequestFunds); + } + + /** + * 修改付款申请单 + * + * @param financeRequestFunds 付款申请单 + * @return 结果 + */ + @Override + public int updateFinanceRequestFunds(FinanceRequestFunds financeRequestFunds) + { + return financeRequestFundsMapper.updateFinanceRequestFunds(financeRequestFunds); + } + + /** + * 删除付款申请单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteFinanceRequestFundsByIds(String ids) + { + return financeRequestFundsMapper.deleteFinanceRequestFundsByIds(Convert.toStrArray(ids)); + } + + /** + * 删除付款申请单信息 + * + * @param requestFundsId 付款申请单ID + * @return 结果 + */ + @Override + public int deleteFinanceRequestFundsById(Integer requestFundsId) + { + return financeRequestFundsMapper.deleteFinanceRequestFundsById(requestFundsId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml deleted file mode 100644 index 5f501e09..00000000 --- a/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select sales_finish_id, sso.sales_order_code AS sales_order_code,sso.sales_order_number AS sales_order_number, appointment_number, sso.enterprise_code AS enterprise_code, sso.enterprise_name AS enterprise_name, - payment_terms, delivery_conditions, delivery_method, order_receiving_mode, customer_contact, customer_factory, - contact_number, business_members, customer_fax, delivery_address, order_receiving_time, billing_time, customer_remarks, - current_inventory, credit_limit, unpaid_amount, available_credit, confirm_tax, tax_rate, total_amount, modification_time, - confirm_time, confirm_no, confirm_name, audit_no, audit_time, audit_remarks, national_tax_bill,finish_product_code, finish_product_name, - specification_model, type_machine, inventory_unit, stock_unit_weight, process_price, product_quantity, amount_money, - delivery_time, line, version_number, sales_explain, customer_use_or_not, customer_use_quantity, customer_use_remarks, - account_reconciliation_or_not, account_reconciliation_person, account_reconciliation_time - FROM sys_sales_order sso,sys_sales_finish ssf - WHERE sso.sales_order_code = ssf.sales_order_code AND sso.sales_order_number = ssf.sales_order_number - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update sys_sales_finish - - sales_order_number = #{salesOrderNumber}, - appointment_number = #{appointmentNumber}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - finish_product_code = #{finishProductCode}, - finish_product_name = #{finishProductName}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - inventory_unit = #{inventoryUnit}, - stock_unit_weight = #{stockUnitWeight}, - process_price = #{processPrice}, - product_quantity = #{productQuantity}, - amount_money = #{amountMoney}, - delivery_time = #{deliveryTime}, - line = #{line}, - version_number = #{versionNumber}, - sales_explain = #{salesExplain}, - customer_use_or_not = #{customerUseOrNot}, - customer_use_quantity = #{customerUseQuantity}, - customer_use_remarks = #{customerUseRemarks}, - account_reconciliation_or_not = #{accountReconciliationOrNot}, - account_reconciliation_person = #{accountReconciliationPerson}, - account_reconciliation_time = #{accountReconciliationTime}, - - where sales_finish_id = #{salesFinishId} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml new file mode 100644 index 00000000..00e81f2c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + ssf.sales_finish_id, + sso.sales_order_code, + sso.sales_order_number, + sso.enterprise_code, + sso.enterprise_name, + sso.payment_terms, + sso.delivery_conditions, + sso.delivery_method, + sso.order_receiving_mode, + sso.customer_contact, + sso.customer_factory, + sso.contact_number, + sso.business_members, + sso.customer_fax, + sso.delivery_address, + sso.order_receiving_time, + sso.billing_time, + sso.customer_remarks, + sso.current_inventory, + sso.credit_limit, + sso.unpaid_amount, + sso.available_credit, + sso.confirm_tax, + sso.tax_rate, + sso.total_amount, + sso.modification_time, + sso.confirm_time, + sso.file_upload, + sso.confirm_no, + sso.confirm_name, + sso.audit_no, + sso.audit_name, + sso.audit_time, + sso.audit_remarks, + sso.national_tax_bill, + ssf.finish_product_code, + ssf.finish_product_name, + ssf.specification_model, + ssf.customer_number, + ssf.type_machine, + ssf.inventory_unit, + ssf.stock_unit_weight, + ssf.common_currency, + ssf.process_price, + ssf.product_quantity, + ssf.amount_money, + ssf.delivery_time, + ssf.line, + ssf.version_number, + ssf.sales_explain, + ssf.customer_use_or_not, + ssf.customer_use_quantity, + ssf.customer_use_remarks, + ssf.account_reconciliation_or_not, + ssf.account_reconciliation_person, + ssf.account_reconciliation_time + FROM + sys_sales_finish AS ssf, + sys_sales_order AS sso + WHERE + ssf.sales_order_code = sso.sales_order_code AND + ssf.sales_order_number = sso.sales_order_number + + + + + + + + insert into sales_order_detail + + sales_order_code, + sales_order_number, + enterprise_code, + enterprise_name, + payment_terms, + delivery_conditions, + delivery_method, + order_receiving_mode, + customer_contact, + customer_factory, + contact_number, + business_members, + customer_fax, + delivery_address, + order_receiving_time, + billing_time, + customer_remarks, + current_inventory, + credit_limit, + unpaid_amount, + available_credit, + confirm_tax, + tax_rate, + total_amount, + modification_time, + confirm_time, + file_upload, + confirm_no, + confirm_name, + audit_no, + audit_name, + audit_time, + audit_remarks, + national_tax_bill, + finish_product_code, + finish_product_name, + specification_model, + customer_number, + type_machine, + inventory_unit, + stock_unit_weight, + common_currency, + process_price, + product_quantity, + amount_money, + delivery_time, + line, + version_number, + sales_explain, + customer_use_or_not, + customer_use_quantity, + customer_use_remarks, + account_reconciliation_or_not, + account_reconciliation_person, + account_reconciliation_time, + + + #{salesOrderCode}, + #{salesOrderNumber}, + #{enterpriseCode}, + #{enterpriseName}, + #{paymentTerms}, + #{deliveryConditions}, + #{deliveryMethod}, + #{orderReceivingMode}, + #{customerContact}, + #{customerFactory}, + #{contactNumber}, + #{businessMembers}, + #{customerFax}, + #{deliveryAddress}, + #{orderReceivingTime}, + #{billingTime}, + #{customerRemarks}, + #{currentInventory}, + #{creditLimit}, + #{unpaidAmount}, + #{availableCredit}, + #{confirmTax}, + #{taxRate}, + #{totalAmount}, + #{modificationTime}, + #{confirmTime}, + #{fileUpload}, + #{confirmNo}, + #{confirmName}, + #{auditNo}, + #{auditName}, + #{auditTime}, + #{auditRemarks}, + #{nationalTaxBill}, + #{finishProductCode}, + #{finishProductName}, + #{specificationModel}, + #{customerNumber}, + #{typeMachine}, + #{inventoryUnit}, + #{stockUnitWeight}, + #{commonCurrency}, + #{processPrice}, + #{productQuantity}, + #{amountMoney}, + #{deliveryTime}, + #{line}, + #{versionNumber}, + #{salesExplain}, + #{customerUseOrNot}, + #{customerUseQuantity}, + #{customerUseRemarks}, + #{accountReconciliationOrNot}, + #{accountReconciliationPerson}, + #{accountReconciliationTime}, + + + + + update sales_order_detail + + sales_order_code = #{salesOrderCode}, + sales_order_number = #{salesOrderNumber}, + enterprise_code = #{enterpriseCode}, + enterprise_name = #{enterpriseName}, + payment_terms = #{paymentTerms}, + delivery_conditions = #{deliveryConditions}, + delivery_method = #{deliveryMethod}, + order_receiving_mode = #{orderReceivingMode}, + customer_contact = #{customerContact}, + customer_factory = #{customerFactory}, + contact_number = #{contactNumber}, + business_members = #{businessMembers}, + customer_fax = #{customerFax}, + delivery_address = #{deliveryAddress}, + order_receiving_time = #{orderReceivingTime}, + billing_time = #{billingTime}, + customer_remarks = #{customerRemarks}, + current_inventory = #{currentInventory}, + credit_limit = #{creditLimit}, + unpaid_amount = #{unpaidAmount}, + available_credit = #{availableCredit}, + confirm_tax = #{confirmTax}, + tax_rate = #{taxRate}, + total_amount = #{totalAmount}, + modification_time = #{modificationTime}, + confirm_time = #{confirmTime}, + file_upload = #{fileUpload}, + confirm_no = #{confirmNo}, + confirm_name = #{confirmName}, + audit_no = #{auditNo}, + audit_name = #{auditName}, + audit_time = #{auditTime}, + audit_remarks = #{auditRemarks}, + national_tax_bill = #{nationalTaxBill}, + finish_product_code = #{finishProductCode}, + finish_product_name = #{finishProductName}, + specification_model = #{specificationModel}, + customer_number = #{customerNumber}, + type_machine = #{typeMachine}, + inventory_unit = #{inventoryUnit}, + stock_unit_weight = #{stockUnitWeight}, + common_currency = #{commonCurrency}, + process_price = #{processPrice}, + product_quantity = #{productQuantity}, + amount_money = #{amountMoney}, + delivery_time = #{deliveryTime}, + line = #{line}, + version_number = #{versionNumber}, + sales_explain = #{salesExplain}, + customer_use_or_not = #{customerUseOrNot}, + customer_use_quantity = #{customerUseQuantity}, + customer_use_remarks = #{customerUseRemarks}, + account_reconciliation_or_not = #{accountReconciliationOrNot}, + account_reconciliation_person = #{accountReconciliationPerson}, + account_reconciliation_time = #{accountReconciliationTime}, + + where sales_finish_id = #{salesFinishId} + + + + delete from sales_order_detail where sales_finish_id = #{salesFinishId} + + + + delete from sales_order_detail where sales_finish_id in + + #{salesFinishId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml index 30e4bc1c..3ba7c0b0 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml @@ -54,23 +54,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sop_code, sop_name, - sop_model, - type_of_machine, - sop_unit, - drawing_file, - workhour_file, - sop_file, - sip_file, - spp_file, - bom_file, - customer_file, - other_file, - customer_code, - customer_name, - date_of_registration, - sop_registrant, - sop_remark, - current_version, + sop_model, + type_of_machine, + sop_unit, + drawing_file, + workhour_file, + sop_file, + sip_file, + spp_file, + bom_file, + customer_file, + other_file, + customer_code, + customer_name, + date_of_registration, + sop_registrant, + sop_remark, + current_version, first_add_time, @@ -102,23 +102,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sop_code = #{sopCode}, sop_name = #{sopName}, - sop_model = #{sopModel}, - type_of_machine = #{typeOfMachine}, - sop_unit = #{sopUnit}, - drawing_file = #{drawingFile}, - workhour_file = #{workhourFile}, - sop_file = #{sopFile}, - sip_file = #{sipFile}, - spp_file = #{sppFile}, - bom_file = #{bomFile}, - customer_file = #{customerFile}, - other_file = #{otherFile}, - customer_code = #{customerCode}, - customer_name = #{customerName}, - date_of_registration = #{dateOfRegistration}, - sop_registrant = #{sopRegistrant}, - sop_remark = #{sopRemark}, - current_version = #{currentVersion}, + sop_model = #{sopModel}, + type_of_machine = #{typeOfMachine}, + sop_unit = #{sopUnit}, + drawing_file = #{drawingFile}, + workhour_file = #{workhourFile}, + sop_file = #{sopFile}, + sip_file = #{sipFile}, + spp_file = #{sppFile}, + bom_file = #{bomFile}, + customer_file = #{customerFile}, + other_file = #{otherFile}, + customer_code = #{customerCode}, + customer_name = #{customerName}, + date_of_registration = #{dateOfRegistration}, + sop_registrant = #{sopRegistrant}, + sop_remark = #{sopRemark}, + current_version = #{currentVersion}, update_info_time = CONCAT_WS(',',NOW(),update_info_time), where sop_id = #{sopId} diff --git a/ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml b/ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml new file mode 100644 index 00000000..da1f10e9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select request_funds_id, request_funds_number, request_funds_time, common_currency, request_person, agreed_payment_deadline, supplier_code, supplier_name, deposit_bank, bank_account, period_of_payment, request_reason_category, request_funds_dept, invoice_category, payment_terms, payment_way, request_amount_total, month_request_total, amount_uppercase, payment_matters, remarks, supervisor_approval_flag, supervisor_approval, supervisor_approval_time, finanace_supervisor_approval_flag, finanace_supervisor_approval, finanace_supervisor_approval_time, deputy_general_manager_approval_flag, deputy_general_manager_approval, deputy_general_manager_approval_time, general_manager_approval_flag, general_manager_approval, general_manager_approval_time, paid_accounting_cashier_flag, paid_accounting_cashier, payment_completion_time, paid_in_amount, deduction_amount, close_case_flag, first_add_time, update_info_time, standby_one, standby_two, standby_three, standby_four from finance_request_funds + + + + + + + + insert into finance_request_funds + + request_funds_number, + request_funds_time, + common_currency, + request_person, + agreed_payment_deadline, + supplier_code, + supplier_name, + deposit_bank, + bank_account, + period_of_payment, + request_reason_category, + request_funds_dept, + invoice_category, + payment_terms, + payment_way, + request_amount_total, + month_request_total, + amount_uppercase, + payment_matters, + remarks, + supervisor_approval_flag, + supervisor_approval, + supervisor_approval_time, + finanace_supervisor_approval_flag, + finanace_supervisor_approval, + finanace_supervisor_approval_time, + deputy_general_manager_approval_flag, + deputy_general_manager_approval, + deputy_general_manager_approval_time, + general_manager_approval_flag, + general_manager_approval, + general_manager_approval_time, + paid_accounting_cashier_flag, + paid_accounting_cashier, + payment_completion_time, + paid_in_amount, + deduction_amount, + close_case_flag, + standby_one, + standby_two, + standby_three, + standby_four, + first_add_time, + + + #{requestFundsNumber}, + #{requestFundsTime}, + #{commonCurrency}, + #{requestPerson}, + #{agreedPaymentDeadline}, + #{supplierCode}, + #{supplierName}, + #{depositBank}, + #{bankAccount}, + #{periodOfPayment}, + #{requestReasonCategory}, + #{requestFundsDept}, + #{invoiceCategory}, + #{paymentTerms}, + #{paymentWay}, + #{requestAmountTotal}, + #{monthRequestTotal}, + #{amountUppercase}, + #{paymentMatters}, + #{remarks}, + #{supervisorApprovalFlag}, + #{supervisorApproval}, + #{supervisorApprovalTime}, + #{finanaceSupervisorApprovalFlag}, + #{finanaceSupervisorApproval}, + #{finanaceSupervisorApprovalTime}, + #{deputyGeneralManagerApprovalFlag}, + #{deputyGeneralManagerApproval}, + #{deputyGeneralManagerApprovalTime}, + #{generalManagerApprovalFlag}, + #{generalManagerApproval}, + #{generalManagerApprovalTime}, + #{paidAccountingCashierFlag}, + #{paidAccountingCashier}, + #{paymentCompletionTime}, + #{paidInAmount}, + #{deductionAmount}, + #{closeCaseFlag}, + #{standbyOne}, + #{standbyTwo}, + #{standbyThree}, + #{standbyFour}, + now(), + + + + + update finance_request_funds + + request_funds_number = #{requestFundsNumber}, + request_funds_time = #{requestFundsTime}, + common_currency = #{commonCurrency}, + request_person = #{requestPerson}, + agreed_payment_deadline = #{agreedPaymentDeadline}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + deposit_bank = #{depositBank}, + bank_account = #{bankAccount}, + period_of_payment = #{periodOfPayment}, + request_reason_category = #{requestReasonCategory}, + request_funds_dept = #{requestFundsDept}, + invoice_category = #{invoiceCategory}, + payment_terms = #{paymentTerms}, + payment_way = #{paymentWay}, + request_amount_total = #{requestAmountTotal}, + month_request_total = #{monthRequestTotal}, + amount_uppercase = #{amountUppercase}, + payment_matters = #{paymentMatters}, + remarks = #{remarks}, + supervisor_approval_flag = #{supervisorApprovalFlag}, + supervisor_approval = #{supervisorApproval}, + supervisor_approval_time = #{supervisorApprovalTime}, + finanace_supervisor_approval_flag = #{finanaceSupervisorApprovalFlag}, + finanace_supervisor_approval = #{finanaceSupervisorApproval}, + finanace_supervisor_approval_time = #{finanaceSupervisorApprovalTime}, + deputy_general_manager_approval_flag = #{deputyGeneralManagerApprovalFlag}, + deputy_general_manager_approval = #{deputyGeneralManagerApproval}, + deputy_general_manager_approval_time = #{deputyGeneralManagerApprovalTime}, + general_manager_approval_flag = #{generalManagerApprovalFlag}, + general_manager_approval = #{generalManagerApproval}, + general_manager_approval_time = #{generalManagerApprovalTime}, + paid_accounting_cashier_flag = #{paidAccountingCashierFlag}, + paid_accounting_cashier = #{paidAccountingCashier}, + payment_completion_time = #{paymentCompletionTime}, + paid_in_amount = #{paidInAmount}, + deduction_amount = #{deductionAmount}, + close_case_flag = #{closeCaseFlag}, + standby_one = #{standbyOne}, + standby_two = #{standbyTwo}, + standby_three = #{standbyThree}, + standby_four = #{standbyFour}, + update_info_time = CONCAT_WS(',',NOW(),update_info_time), + + where request_funds_id = #{requestFundsId} + + + + delete from finance_request_funds where request_funds_id = #{requestFundsId} + + + + delete from finance_request_funds where request_funds_id in + + #{requestFundsId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html index 751ec553..7563fbaa 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html @@ -61,9 +61,9 @@ 删除 - - 导出 - + + +
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html index 83b36018..84969d46 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html @@ -215,6 +215,7 @@ title: '入库单号', footerFormatter: function (value) { var count = 0; + // console.log(value) for (var i in value) { count+= parseFloat(value[i].warehousingQuantity); } @@ -227,6 +228,7 @@ title: '订购单号', footerFormatter: function (value) { var count = 0; + // console.log(value) for (var i in value) { count+= parseFloat(value[i].amountMoney); } diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html index 6b0b1b30..65e30805 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html +++ b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html @@ -1,11 +1,12 @@ - + +
-
+
@@ -18,28 +19,16 @@
-
- -
- -
-
- - 代码生成请选择字典属性 +
- - 代码生成请选择字典属性 +
@@ -105,7 +94,10 @@
- +
+ + +
@@ -174,6 +166,12 @@
+
+ +
+ +
+
@@ -187,57 +185,29 @@
- +
- +
- +
- +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@@ -262,6 +232,12 @@
+
+ +
+ +
+
@@ -277,7 +253,16 @@
- + + 代码生成请选择字典属性 +
+
+
+ +
+
@@ -322,20 +307,63 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html index a2cc66ac..14aa6d4e 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html +++ b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html @@ -1,12 +1,13 @@ - + +
-
- + +
@@ -19,28 +20,16 @@
-
- -
- -
-
- - 代码生成请选择字典属性 +
- - 代码生成请选择字典属性 +
@@ -106,7 +95,10 @@
- +
+ + +
@@ -175,6 +167,12 @@
+
+ +
+ +
+
@@ -188,57 +186,29 @@
- +
- +
- +
- +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@@ -263,6 +233,12 @@
+
+ +
+ +
+
@@ -278,7 +254,16 @@
- + + 代码生成请选择字典属性 +
+
+
+ +
+
@@ -323,20 +308,63 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html index 0c5cbc04..541bd136 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html @@ -1,45 +1,42 @@ - + - + -
+
  • - - + + - - +
    • + + + +
    • + + + +
  • - - + +
  • - - + +
  • @@ -50,8 +47,17 @@
  • -  搜索 -  重置 + + + +
    • +
  • +  搜索 +  重置
@@ -59,314 +65,402 @@
- - + + + + + - 销售订单详情 - - + + + + 导出 +
- -
-
+
+
-
- \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html index 492d48c3..42034954 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html @@ -386,6 +386,7 @@ smartDisplay: false, // 加了这个才显示每页显示的行数 showExport: false, // 是否显示导出按钮 clickToSelect: true,//点击行选中 + contentType: "application/x-www-form-urlencoded", paginationDetailHAlign: ' hiddenDetailInfo', height: 250, uniqueId: 'materialCode', diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html index a2281adc..402c5f76 100644 --- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html +++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html @@ -119,9 +119,11 @@ field: 'drawingFile', title: '图纸文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -129,9 +131,11 @@ field: 'workhourFile', title: '工时文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -139,9 +143,11 @@ field: 'sopFile', title: 'SOP文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -149,9 +155,11 @@ field: 'sipFile', title: 'SIP文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -159,9 +167,11 @@ field: 'sppFile', title: 'SPP文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -169,9 +179,11 @@ field: 'bomFile', title: 'BOM文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -179,9 +191,11 @@ field: 'customerFile', title: '客户文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, @@ -189,9 +203,11 @@ field: 'otherFile', title: '其他文件', formatter: function(value, row, index) { - var filepath = value.substring(value.lastIndexOf("/")+1) var actions = []; - actions.push(''+filepath+' '); + if (value !== null) { + var filepath = value.substring(value.lastIndexOf("/")+1) + actions.push(''+filepath+' '); + } return actions.join(''); } }, diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html new file mode 100644 index 00000000..83bbdced --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html @@ -0,0 +1,420 @@ + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+ +
+ + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html new file mode 100644 index 00000000..d9eb3232 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html @@ -0,0 +1,396 @@ + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html new file mode 100644 index 00000000..51d0a968 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html @@ -0,0 +1,406 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class b/ruoyi-framework/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class index 6ac45a376f1cd9a4364986215bebf93b4f033fcb..9a8b19a07fc5c19aeb0d67cfe723a3358bdce16f 100644 GIT binary patch delta 26 icmcaEdRcUXJ167P$sU}3%yJCulV@_uZr;Ty%Lo8 Date: Mon, 3 Jul 2023 14:49:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?vnaRawData.html=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log.path_IS_UNDEFINED/sys-user.log | 5 --- ruoyi-activiti/pom.xml | 8 ++++- .../rfMsg/vnaRawData/vnaRawData.html | 36 +++++++++++++++++++ smart-erp.iml | 12 ------- 4 files changed, 43 insertions(+), 18 deletions(-) delete mode 100644 log.path_IS_UNDEFINED/sys-user.log delete mode 100644 smart-erp.iml diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log deleted file mode 100644 index 98392e9a..00000000 --- a/log.path_IS_UNDEFINED/sys-user.log +++ /dev/null @@ -1,5 +0,0 @@ -11:47:36.657 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -15:56:03.944 [schedule-pool-12] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -16:12:42.082 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -16:12:42.088 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -16:12:42.089 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== diff --git a/ruoyi-activiti/pom.xml b/ruoyi-activiti/pom.xml index 694e875c..3d8e1309 100644 --- a/ruoyi-activiti/pom.xml +++ b/ruoyi-activiti/pom.xml @@ -62,7 +62,13 @@ junit test - + + org.mybatis + mybatis + 3.5.6 + compile + + diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html index 5f6f5466..68bf78c4 100644 --- a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html +++ b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html @@ -2,6 +2,9 @@ +
@@ -176,10 +179,43 @@ // + ""; // } //将动态生成的table添加的事先隐藏的div中. + var chartsInfo =""; + chartsInfo+="" + + "
" + + "" + + "" + tableTbody+=chartsInfo $("#tbody_"+id).html(tableTbody); + initEcharts(listKey,listValue,id) } }) } + + + function initEcharts(listKey ,listValue,id){ + var chartDom = document.getElementById('charts'+id); + var myChart = echarts.init(chartDom); + var option; + + option = { + xAxis: { + type: 'category', + data: listKey + }, + yAxis: { + type: 'value' + }, + series: [ + { + data: listValue, + type: 'line', + smooth: true + } + ] + }; + + option && myChart.setOption(option); + } \ No newline at end of file diff --git a/smart-erp.iml b/smart-erp.iml deleted file mode 100644 index f409c0ea..00000000 --- a/smart-erp.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file