Browse Source

Merge remote-tracking branch 'origin/master' into gsw

erp、
qianyu 1 year ago
parent
commit
b82f3bc570
  1. 5
      log.path_IS_UNDEFINED/sys-user.log
  2. 8
      ruoyi-activiti/pom.xml
  3. 2
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/DeliveryGoodsNoticeServiceImpl.java
  4. 10
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/MaterialRequisitionInfoServiceImpl.java
  5. 2
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java
  6. 2
      ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WorkOrderInfoServiceImpl.java
  7. 2
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceInspectionNoticeServiceImpl.java
  8. 2
      ruoyi-admin/src/main/java/com/ruoyi/outsource/service/impl/OutsourceOrderInfoServiceImpl.java
  9. 2
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
  10. 4
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsKhthScInfoServiceImpl.java
  11. 2
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/ReturnGoodsOrderServiceImpl.java
  12. 36
      ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java
  13. 159
      ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java
  14. 198
      ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java
  15. 858
      ruoyi-admin/src/main/java/com/ruoyi/sales/domain/exportDto/SalesOrderDetailDto.java
  16. 41
      ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java
  17. 53
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java
  18. 51
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java
  19. 45
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/OutboundInfoController.java
  20. 2
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingCheckInfoServiceImpl.java
  21. 12
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java
  22. 4
      ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInspectionNoticeServiceImpl.java
  23. 12
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
  24. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductQuotationServiceImpl.java
  25. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysQutsourcingQuotationServiceImpl.java
  26. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
  27. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierQuotationServiceImpl.java
  28. 131
      ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/controller/FinanceRequestFundsController.java
  29. 649
      ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/domain/FinanceRequestFunds.java
  30. 61
      ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/mapper/FinanceRequestFundsMapper.java
  31. 61
      ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/IFinanceRequestFundsService.java
  32. 94
      ruoyi-admin/src/main/java/com/ruoyi/taxInvoice/service/impl/FinanceRequestFundsServiceImpl.java
  33. 250
      ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml
  34. 344
      ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml
  35. 68
      ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml
  36. 245
      ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml
  37. 6
      ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
  38. 2
      ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html
  39. 134
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html
  40. 136
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html
  41. 708
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html
  42. 1
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingCheckInfo/edit.html
  43. 48
      ruoyi-admin/src/main/resources/templates/system/sop/sop.html
  44. 420
      ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html
  45. 396
      ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html
  46. 406
      ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html
  47. BIN
      ruoyi-framework/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class
  48. BIN
      ruoyi-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class
  49. 12
      smart-erp.iml

5
log.path_IS_UNDEFINED/sys-user.log

@ -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] - ====关闭缓存====

8
ruoyi-activiti/pom.xml

@ -62,7 +62,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.6</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.ruoyi</groupId>-->
<!-- <artifactId>ruoyi-system</artifactId>-->
<!-- </dependency>-->

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

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

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

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

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

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

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

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

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

36
ruoyi-admin/src/main/java/com/ruoyi/rfMsg/domain/VnaRawDataKeyValue.java

@ -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();
}
}

159
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<SalesOrderDetail> list = salesOrderDetailService.selectSalesOrderDetailList(salesOrderDetail);
ExcelUtil<SalesOrderDetail> util = new ExcelUtil<SalesOrderDetail>(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<SysCustomer> getCustomerList(SysCustomer customer) {
List<SysCustomer> 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<SalesOrderDetailDto> salesOrderDetailDtoList =new ArrayList<>();
List<SalesOrderDetail> 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<SysDictData> sysCommonCurrencyData = sysDictTypeService.selectDictDataByType("sys_common_currency");
for (int i = 0;i<sysCommonCurrencyData.size();i++) {
if (target.getCommonCurrency().equals(sysCommonCurrencyData.get(i).getDictValue())) {
target.setCommonCurrency(sysCommonCurrencyData.get(i).getDictLabel());
}
}
String salesOrderNumber1 = salesOrderDetail1.getSalesOrderNumber();
String finishProductCode1 = salesOrderDetail1.getFinishProductCode();
String productQuantity1 = salesOrderDetail1.getProductQuantity();
//发货通知
DeliveryGoodsDetail deliveryGoodsDetail = new DeliveryGoodsDetail();
deliveryGoodsDetail.setSalesOrderNumber(salesOrderNumber1);
deliveryGoodsDetail.setFinishProductCode(finishProductCode1);
List<DeliveryGoodsDetail> 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<WorkOrderInfo> 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<String, Object> 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);
}
}
}

198
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();
}
}

858
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();
}
}

41
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<SalesOrderDetail> 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);
}

53
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<SalesOrderDetail> 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);
}

51
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<SalesOrderDetail> 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);
}
}

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

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

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

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

12
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;
/** 客户使用否 */

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

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

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

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

131
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<FinanceRequestFunds> 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<FinanceRequestFunds> list = financeRequestFundsService.selectFinanceRequestFundsList(financeRequestFunds);
ExcelUtil<FinanceRequestFunds> util = new ExcelUtil<FinanceRequestFunds>(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);
}
}

649
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();
}
}

61
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<FinanceRequestFunds> 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);
}

61
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<FinanceRequestFunds> 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);
}

94
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<FinanceRequestFunds> 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);
}
}

250
ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetail.xml

@ -1,250 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.SalesOrderDetailMapper">
<resultMap type="SalesOrderDetail" id="SalesOrderDetailResult">
<result property="salesFinishId" column="sales_finish_id" />
<result property="salesOrderCode" column="sales_order_code" />
<result property="salesOrderNumber" column="sales_order_number" />
<result property="appointmentNumber" column="appointment_number" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="paymentTerms" column="payment_terms" />
<result property="deliveryConditions" column="delivery_conditions" />
<result property="deliveryMethod" column="delivery_method" />
<result property="orderReceivingMode" column="order_receiving_mode" />
<result property="customerContact" column="customer_contact" />
<result property="customerFactory" column="customer_factory" />
<result property="contactNumber" column="contact_number" />
<result property="businessMembers" column="business_members" />
<result property="customerFax" column="customer_fax" />
<result property="deliveryAddress" column="delivery_address" />
<result property="orderReceivingTime" column="order_receiving_time" />
<result property="billingTime" column="billing_time" />
<result property="customerRemarks" column="customer_remarks" />
<result property="currentInventory" column="current_inventory" />
<result property="creditLimit" column="credit_limit" />
<result property="unpaidAmount" column="unpaid_amount" />
<result property="availableCredit" column="available_credit" />
<result property="confirmTax" column="confirm_tax" />
<result property="taxRate" column="tax_rate" />
<result property="totalAmount" column="total_amount" />
<result property="modificationTime" column="modification_time" />
<result property="confirmTime" column="confirm_time" />
<result property="confirmNo" column="confirm_no" />
<result property="confirmName" column="confirm_name" />
<result property="auditNo" column="audit_no" />
<result property="auditName" column="audit_name" />
<result property="auditTime" column="audit_time" />
<result property="auditRemarks" column="audit_remarks" />
<result property="nationalTaxBill" column="national_tax_bill" />
<result property="finishProductCode" column="finish_product_code" />
<result property="finishProductName" column="finish_product_name" />
<result property="specificationModel" column="specification_model" />
<result property="typeMachine" column="type_machine" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="stockUnitWeight" column="stock_unit_weight" />
<result property="processPrice" column="process_price" />
<result property="productQuantity" column="product_quantity" />
<result property="amountMoney" column="amount_money" />
<result property="deliveryTime" column="delivery_time" />
<result property="line" column="line" />
<result property="versionNumber" column="version_number" />
<result property="salesExplain" column="sales_explain" />
<result property="customerUseOrNot" column="customer_use_or_not" />
<result property="customerUseQuantity" column="customer_use_quantity" />
<result property="customerUseRemarks" column="customer_use_remarks" />
<result property="accountReconciliationOrNot" column="account_reconciliation_or_not" />
<result property="accountReconciliationPerson" column="account_reconciliation_person" />
<result property="accountReconciliationTime" column="account_reconciliation_time" />
</resultMap>
<!-- <sql id="selectSalesOrderDetailVo">-->
<!-- select sales_order_code, sales_order_number, appointment_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, confirm_no, confirm_name, audit_no, audit_name, audit_time, audit_remarks, customer_use_or_not, account_reconciliation_or_not, account_reconciliation_person, account_reconciliation_time, 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 from sales_account_reconciliation-->
<!-- </sql>-->
<sql id="selectSalesOrderDetailVo">
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
</sql>
<select id="selectSalesOrderDetailList" parameterType="SalesOrderDetail" resultMap="SalesOrderDetailResult">
<include refid="selectSalesOrderDetailVo"/>
<if test="salesOrderNumber != null and salesOrderNumber != ''"> and sso.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and sso.enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and sso.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="customerUseOrNot != null and customerUseOrNot != ''"> and customer_use_or_not = #{customerUseOrNot}</if>
<if test="accountReconciliationOrNot != null and accountReconciliationOrNot != ''"> and account_reconciliation_or_not = #{accountReconciliationOrNot}</if>
<if test="nationalTaxBill != null and nationalTaxBill != ''"> and national_tax_bill = #{nationalTaxBill}</if>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
<if test="finishProductName != null and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
</select>
<!-- -->
<!-- <select id="selectSalesOrderDetailById" parameterType="String" resultMap="SalesOrderDetailResult">-->
<!-- <include refid="selectSalesOrderDetailVo"/>-->
<!-- where sales_order_code = #{salesOrderCode}-->
<!-- </select>-->
<!-- -->
<!-- <insert id="insertSalesOrderDetail" parameterType="SalesOrderDetail">-->
<!-- insert into sales_account_reconciliation-->
<!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
<!-- <if test="salesOrderCode != null">sales_order_code,</if>-->
<!-- <if test="salesOrderNumber != null">sales_order_number,</if>-->
<!-- <if test="appointmentNumber != null">appointment_number,</if>-->
<!-- <if test="enterpriseCode != null">enterprise_code,</if>-->
<!-- <if test="enterpriseName != null">enterprise_name,</if>-->
<!-- <if test="paymentTerms != null">payment_terms,</if>-->
<!-- <if test="deliveryConditions != null">delivery_conditions,</if>-->
<!-- <if test="deliveryMethod != null">delivery_method,</if>-->
<!-- <if test="orderReceivingMode != null">order_receiving_mode,</if>-->
<!-- <if test="customerContact != null">customer_contact,</if>-->
<!-- <if test="customerFactory != null">customer_factory,</if>-->
<!-- <if test="contactNumber != null">contact_number,</if>-->
<!-- <if test="businessMembers != null">business_members,</if>-->
<!-- <if test="customerFax != null">customer_fax,</if>-->
<!-- <if test="deliveryAddress != null">delivery_address,</if>-->
<!-- <if test="orderReceivingTime != null">order_receiving_time,</if>-->
<!-- <if test="billingTime != null">billing_time,</if>-->
<!-- <if test="customerRemarks != null">customer_remarks,</if>-->
<!-- <if test="currentInventory != null">current_inventory,</if>-->
<!-- <if test="creditLimit != null">credit_limit,</if>-->
<!-- <if test="unpaidAmount != null">unpaid_amount,</if>-->
<!-- <if test="availableCredit != null">available_credit,</if>-->
<!-- <if test="confirmTax != null">confirm_tax,</if>-->
<!-- <if test="taxRate != null">tax_rate,</if>-->
<!-- <if test="totalAmount != null">total_amount,</if>-->
<!-- <if test="modificationTime != null">modification_time,</if>-->
<!-- <if test="confirmTime != null">confirm_time,</if>-->
<!-- <if test="confirmNo != null">confirm_no,</if>-->
<!-- <if test="confirmName != null">confirm_name,</if>-->
<!-- <if test="auditNo != null">audit_no,</if>-->
<!-- <if test="auditName != null">audit_name,</if>-->
<!-- <if test="auditTime != null">audit_time,</if>-->
<!-- <if test="auditRemarks != null">audit_remarks,</if>-->
<!-- <if test="customerUseOrNot != null">customer_use_or_not,</if>-->
<!-- <if test="accountReconciliationOrNot != null">account_reconciliation_or_not,</if>-->
<!-- <if test="accountReconciliationPerson != null">account_reconciliation_person,</if>-->
<!-- <if test="accountReconciliationTime != null">account_reconciliation_time,</if>-->
<!-- <if test="nationalTaxBill != null">national_tax_bill,</if>-->
<!-- <if test="finishProductCode != null">finish_product_code,</if>-->
<!-- <if test="finishProductName != null">finish_product_name,</if>-->
<!-- <if test="specificationModel != null">specification_model,</if>-->
<!-- <if test="typeMachine != null">type_machine,</if>-->
<!-- <if test="inventoryUnit != null">inventory_unit,</if>-->
<!-- <if test="stockUnitWeight != null">stock_unit_weight,</if>-->
<!-- <if test="processPrice != null">process_price,</if>-->
<!-- <if test="productQuantity != null">product_quantity,</if>-->
<!-- <if test="amountMoney != null">amount_money,</if>-->
<!-- <if test="deliveryTime != null">delivery_time,</if>-->
<!-- <if test="line != null">line,</if>-->
<!-- <if test="versionNumber != null">version_number,</if>-->
<!-- <if test="salesExplain != null">sales_explain,</if>-->
<!-- </trim>-->
<!-- <trim prefix="values (" suffix=")" suffixOverrides=",">-->
<!-- <if test="salesOrderCode != null">#{salesOrderCode},</if>-->
<!-- <if test="salesOrderNumber != null">#{salesOrderNumber},</if>-->
<!-- <if test="appointmentNumber != null">#{appointmentNumber},</if>-->
<!-- <if test="enterpriseCode != null">#{enterpriseCode},</if>-->
<!-- <if test="enterpriseName != null">#{enterpriseName},</if>-->
<!-- <if test="paymentTerms != null">#{paymentTerms},</if>-->
<!-- <if test="deliveryConditions != null">#{deliveryConditions},</if>-->
<!-- <if test="deliveryMethod != null">#{deliveryMethod},</if>-->
<!-- <if test="orderReceivingMode != null">#{orderReceivingMode},</if>-->
<!-- <if test="customerContact != null">#{customerContact},</if>-->
<!-- <if test="customerFactory != null">#{customerFactory},</if>-->
<!-- <if test="contactNumber != null">#{contactNumber},</if>-->
<!-- <if test="businessMembers != null">#{businessMembers},</if>-->
<!-- <if test="customerFax != null">#{customerFax},</if>-->
<!-- <if test="deliveryAddress != null">#{deliveryAddress},</if>-->
<!-- <if test="orderReceivingTime != null">#{orderReceivingTime},</if>-->
<!-- <if test="billingTime != null">#{billingTime},</if>-->
<!-- <if test="customerRemarks != null">#{customerRemarks},</if>-->
<!-- <if test="currentInventory != null">#{currentInventory},</if>-->
<!-- <if test="creditLimit != null">#{creditLimit},</if>-->
<!-- <if test="unpaidAmount != null">#{unpaidAmount},</if>-->
<!-- <if test="availableCredit != null">#{availableCredit},</if>-->
<!-- <if test="confirmTax != null">#{confirmTax},</if>-->
<!-- <if test="taxRate != null">#{taxRate},</if>-->
<!-- <if test="totalAmount != null">#{totalAmount},</if>-->
<!-- <if test="modificationTime != null">#{modificationTime},</if>-->
<!-- <if test="confirmTime != null">#{confirmTime},</if>-->
<!-- <if test="confirmNo != null">#{confirmNo},</if>-->
<!-- <if test="confirmName != null">#{confirmName},</if>-->
<!-- <if test="auditNo != null">#{auditNo},</if>-->
<!-- <if test="auditName != null">#{auditName},</if>-->
<!-- <if test="auditTime != null">#{auditTime},</if>-->
<!-- <if test="auditRemarks != null">#{auditRemarks},</if>-->
<!-- <if test="customerUseOrNot != null">#{customerUseOrNot},</if>-->
<!-- <if test="accountReconciliationOrNot != null">#{accountReconciliationOrNot},</if>-->
<!-- <if test="accountReconciliationPerson != null">#{accountReconciliationPerson},</if>-->
<!-- <if test="accountReconciliationTime != null">#{accountReconciliationTime},</if>-->
<!-- <if test="nationalTaxBill != null">#{nationalTaxBill},</if>-->
<!-- <if test="finishProductCode != null">#{finishProductCode},</if>-->
<!-- <if test="finishProductName != null">#{finishProductName},</if>-->
<!-- <if test="specificationModel != null">#{specificationModel},</if>-->
<!-- <if test="typeMachine != null">#{typeMachine},</if>-->
<!-- <if test="inventoryUnit != null">#{inventoryUnit},</if>-->
<!-- <if test="stockUnitWeight != null">#{stockUnitWeight},</if>-->
<!-- <if test="processPrice != null">#{processPrice},</if>-->
<!-- <if test="productQuantity != null">#{productQuantity},</if>-->
<!-- <if test="amountMoney != null">#{amountMoney},</if>-->
<!-- <if test="deliveryTime != null">#{deliveryTime},</if>-->
<!-- <if test="line != null">#{line},</if>-->
<!-- <if test="versionNumber != null">#{versionNumber},</if>-->
<!-- <if test="salesExplain != null">#{salesExplain},</if>-->
<!-- </trim>-->
<!-- </insert>-->
<update id="updateSalesOrderDetail" parameterType="SalesOrderDetail">
update sys_sales_finish
<trim prefix="SET" suffixOverrides=",">
<if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
<if test="appointmentNumber != null">appointment_number = #{appointmentNumber},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
<if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="typeMachine != null">type_machine = #{typeMachine},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="stockUnitWeight != null">stock_unit_weight = #{stockUnitWeight},</if>
<if test="processPrice != null">process_price = #{processPrice},</if>
<if test="productQuantity != null">product_quantity = #{productQuantity},</if>
<if test="amountMoney != null">amount_money = #{amountMoney},</if>
<if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
<if test="line != null">line = #{line},</if>
<if test="versionNumber != null">version_number = #{versionNumber},</if>
<if test="salesExplain != null">sales_explain = #{salesExplain},</if>
<if test="customerUseOrNot != null">customer_use_or_not = #{customerUseOrNot},</if>
<if test="customerUseQuantity != null">customer_use_quantity = #{customerUseQuantity},</if>
<if test="customerUseRemarks != null">customer_use_remarks = #{customerUseRemarks},</if>
<if test="accountReconciliationOrNot != null">account_reconciliation_or_not = #{accountReconciliationOrNot},</if>
<if test="accountReconciliationPerson != null">account_reconciliation_person = #{accountReconciliationPerson},</if>
<if test="accountReconciliationTime != null">account_reconciliation_time = #{accountReconciliationTime},</if>
</trim>
where sales_finish_id = #{salesFinishId}
</update>
<!-- <delete id="deleteSalesOrderDetailById" parameterType="String">-->
<!-- delete from sales_account_reconciliation where sales_order_code = #{salesOrderCode}-->
<!-- </delete>-->
<!-- <delete id="deleteSalesOrderDetailByIds" parameterType="String">-->
<!-- delete from sales_account_reconciliation where sales_order_code in -->
<!-- <foreach item="salesOrderCode" collection="array" open="(" separator="," close=")">-->
<!-- #{salesOrderCode}-->
<!-- </foreach>-->
<!-- </delete>-->
</mapper>

344
ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml

@ -0,0 +1,344 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.SalesOrderDetailMapper">
<resultMap type="SalesOrderDetail" id="SalesOrderDetailResult">
<result property="salesFinishId" column="sales_finish_id" />
<result property="salesOrderCode" column="sales_order_code" />
<result property="salesOrderNumber" column="sales_order_number" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="paymentTerms" column="payment_terms" />
<result property="deliveryConditions" column="delivery_conditions" />
<result property="deliveryMethod" column="delivery_method" />
<result property="orderReceivingMode" column="order_receiving_mode" />
<result property="customerContact" column="customer_contact" />
<result property="customerFactory" column="customer_factory" />
<result property="contactNumber" column="contact_number" />
<result property="businessMembers" column="business_members" />
<result property="customerFax" column="customer_fax" />
<result property="deliveryAddress" column="delivery_address" />
<result property="orderReceivingTime" column="order_receiving_time" />
<result property="billingTime" column="billing_time" />
<result property="customerRemarks" column="customer_remarks" />
<result property="currentInventory" column="current_inventory" />
<result property="creditLimit" column="credit_limit" />
<result property="unpaidAmount" column="unpaid_amount" />
<result property="availableCredit" column="available_credit" />
<result property="confirmTax" column="confirm_tax" />
<result property="taxRate" column="tax_rate" />
<result property="totalAmount" column="total_amount" />
<result property="modificationTime" column="modification_time" />
<result property="confirmTime" column="confirm_time" />
<result property="fileUpload" column="file_upload" />
<result property="confirmNo" column="confirm_no" />
<result property="confirmName" column="confirm_name" />
<result property="auditNo" column="audit_no" />
<result property="auditName" column="audit_name" />
<result property="auditTime" column="audit_time" />
<result property="auditRemarks" column="audit_remarks" />
<result property="nationalTaxBill" column="national_tax_bill" />
<result property="finishProductCode" column="finish_product_code" />
<result property="finishProductName" column="finish_product_name" />
<result property="specificationModel" column="specification_model" />
<result property="customerNumber" column="customer_number" />
<result property="typeMachine" column="type_machine" />
<result property="inventoryUnit" column="inventory_unit" />
<result property="stockUnitWeight" column="stock_unit_weight" />
<result property="commonCurrency" column="common_currency" />
<result property="processPrice" column="process_price" />
<result property="productQuantity" column="product_quantity" />
<result property="amountMoney" column="amount_money" />
<result property="deliveryTime" column="delivery_time" />
<result property="line" column="line" />
<result property="versionNumber" column="version_number" />
<result property="salesExplain" column="sales_explain" />
<result property="customerUseOrNot" column="customer_use_or_not" />
<result property="customerUseQuantity" column="customer_use_quantity" />
<result property="customerUseRemarks" column="customer_use_remarks" />
<result property="accountReconciliationOrNot" column="account_reconciliation_or_not" />
<result property="accountReconciliationPerson" column="account_reconciliation_person" />
<result property="accountReconciliationTime" column="account_reconciliation_time" />
</resultMap>
<!-- <sql id="selectSalesOrderDetailVo">-->
<!-- select sales_finish_id, 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 from sales_order_detail-->
<!-- </sql>-->
<sql id="selectSalesOrderDetailVo">
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
</sql>
<select id="selectSalesOrderDetailList" parameterType="SalesOrderDetail" resultMap="SalesOrderDetailResult">
<include refid="selectSalesOrderDetailVo"/>
<if test="salesOrderCode != null and salesOrderCode != ''"> and sso.sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
<if test="salesOrderNumber != null and salesOrderNumber != ''"> and sso.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and sso.enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
<if test="enterpriseName != null and enterpriseName != ''"> and sso.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="orderReceivingMode != null and orderReceivingMode != ''"> and order_receiving_mode like concat('%', #{orderReceivingMode}, '%')</if>
<if test="params.beginOrderReceivingTime != null and params.beginOrderReceivingTime != '' and params.endOrderReceivingTime != null and params.endOrderReceivingTime != ''"> and order_receiving_time between #{params.beginOrderReceivingTime} and #{params.endOrderReceivingTime}</if>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
<if test="finishProductName != null and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
<if test="commonCurrency != null and commonCurrency != ''"> and common_currency = #{commonCurrency}</if>
</select>
<select id="selectSalesOrderDetailById" parameterType="Long" resultMap="SalesOrderDetailResult">
<include refid="selectSalesOrderDetailVo"/>
and sales_finish_id = #{salesFinishId}
</select>
<insert id="insertSalesOrderDetail" parameterType="SalesOrderDetail" useGeneratedKeys="true" keyProperty="salesFinishId">
insert into sales_order_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code,</if>
<if test="salesOrderNumber != null">sales_order_number,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="paymentTerms != null">payment_terms,</if>
<if test="deliveryConditions != null">delivery_conditions,</if>
<if test="deliveryMethod != null">delivery_method,</if>
<if test="orderReceivingMode != null">order_receiving_mode,</if>
<if test="customerContact != null">customer_contact,</if>
<if test="customerFactory != null">customer_factory,</if>
<if test="contactNumber != null">contact_number,</if>
<if test="businessMembers != null">business_members,</if>
<if test="customerFax != null">customer_fax,</if>
<if test="deliveryAddress != null">delivery_address,</if>
<if test="orderReceivingTime != null">order_receiving_time,</if>
<if test="billingTime != null">billing_time,</if>
<if test="customerRemarks != null">customer_remarks,</if>
<if test="currentInventory != null">current_inventory,</if>
<if test="creditLimit != null">credit_limit,</if>
<if test="unpaidAmount != null">unpaid_amount,</if>
<if test="availableCredit != null">available_credit,</if>
<if test="confirmTax != null">confirm_tax,</if>
<if test="taxRate != null">tax_rate,</if>
<if test="totalAmount != null">total_amount,</if>
<if test="modificationTime != null">modification_time,</if>
<if test="confirmTime != null">confirm_time,</if>
<if test="fileUpload != null">file_upload,</if>
<if test="confirmNo != null">confirm_no,</if>
<if test="confirmName != null">confirm_name,</if>
<if test="auditNo != null">audit_no,</if>
<if test="auditName != null">audit_name,</if>
<if test="auditTime != null">audit_time,</if>
<if test="auditRemarks != null">audit_remarks,</if>
<if test="nationalTaxBill != null">national_tax_bill,</if>
<if test="finishProductCode != null">finish_product_code,</if>
<if test="finishProductName != null">finish_product_name,</if>
<if test="specificationModel != null">specification_model,</if>
<if test="customerNumber != null">customer_number,</if>
<if test="typeMachine != null">type_machine,</if>
<if test="inventoryUnit != null">inventory_unit,</if>
<if test="stockUnitWeight != null">stock_unit_weight,</if>
<if test="commonCurrency != null">common_currency,</if>
<if test="processPrice != null">process_price,</if>
<if test="productQuantity != null">product_quantity,</if>
<if test="amountMoney != null">amount_money,</if>
<if test="deliveryTime != null">delivery_time,</if>
<if test="line != null">line,</if>
<if test="versionNumber != null">version_number,</if>
<if test="salesExplain != null">sales_explain,</if>
<if test="customerUseOrNot != null">customer_use_or_not,</if>
<if test="customerUseQuantity != null">customer_use_quantity,</if>
<if test="customerUseRemarks != null">customer_use_remarks,</if>
<if test="accountReconciliationOrNot != null">account_reconciliation_or_not,</if>
<if test="accountReconciliationPerson != null">account_reconciliation_person,</if>
<if test="accountReconciliationTime != null">account_reconciliation_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">#{salesOrderCode},</if>
<if test="salesOrderNumber != null">#{salesOrderNumber},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="paymentTerms != null">#{paymentTerms},</if>
<if test="deliveryConditions != null">#{deliveryConditions},</if>
<if test="deliveryMethod != null">#{deliveryMethod},</if>
<if test="orderReceivingMode != null">#{orderReceivingMode},</if>
<if test="customerContact != null">#{customerContact},</if>
<if test="customerFactory != null">#{customerFactory},</if>
<if test="contactNumber != null">#{contactNumber},</if>
<if test="businessMembers != null">#{businessMembers},</if>
<if test="customerFax != null">#{customerFax},</if>
<if test="deliveryAddress != null">#{deliveryAddress},</if>
<if test="orderReceivingTime != null">#{orderReceivingTime},</if>
<if test="billingTime != null">#{billingTime},</if>
<if test="customerRemarks != null">#{customerRemarks},</if>
<if test="currentInventory != null">#{currentInventory},</if>
<if test="creditLimit != null">#{creditLimit},</if>
<if test="unpaidAmount != null">#{unpaidAmount},</if>
<if test="availableCredit != null">#{availableCredit},</if>
<if test="confirmTax != null">#{confirmTax},</if>
<if test="taxRate != null">#{taxRate},</if>
<if test="totalAmount != null">#{totalAmount},</if>
<if test="modificationTime != null">#{modificationTime},</if>
<if test="confirmTime != null">#{confirmTime},</if>
<if test="fileUpload != null">#{fileUpload},</if>
<if test="confirmNo != null">#{confirmNo},</if>
<if test="confirmName != null">#{confirmName},</if>
<if test="auditNo != null">#{auditNo},</if>
<if test="auditName != null">#{auditName},</if>
<if test="auditTime != null">#{auditTime},</if>
<if test="auditRemarks != null">#{auditRemarks},</if>
<if test="nationalTaxBill != null">#{nationalTaxBill},</if>
<if test="finishProductCode != null">#{finishProductCode},</if>
<if test="finishProductName != null">#{finishProductName},</if>
<if test="specificationModel != null">#{specificationModel},</if>
<if test="customerNumber != null">#{customerNumber},</if>
<if test="typeMachine != null">#{typeMachine},</if>
<if test="inventoryUnit != null">#{inventoryUnit},</if>
<if test="stockUnitWeight != null">#{stockUnitWeight},</if>
<if test="commonCurrency != null">#{commonCurrency},</if>
<if test="processPrice != null">#{processPrice},</if>
<if test="productQuantity != null">#{productQuantity},</if>
<if test="amountMoney != null">#{amountMoney},</if>
<if test="deliveryTime != null">#{deliveryTime},</if>
<if test="line != null">#{line},</if>
<if test="versionNumber != null">#{versionNumber},</if>
<if test="salesExplain != null">#{salesExplain},</if>
<if test="customerUseOrNot != null">#{customerUseOrNot},</if>
<if test="customerUseQuantity != null">#{customerUseQuantity},</if>
<if test="customerUseRemarks != null">#{customerUseRemarks},</if>
<if test="accountReconciliationOrNot != null">#{accountReconciliationOrNot},</if>
<if test="accountReconciliationPerson != null">#{accountReconciliationPerson},</if>
<if test="accountReconciliationTime != null">#{accountReconciliationTime},</if>
</trim>
</insert>
<update id="updateSalesOrderDetail" parameterType="SalesOrderDetail">
update sales_order_detail
<trim prefix="SET" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
<if test="deliveryConditions != null">delivery_conditions = #{deliveryConditions},</if>
<if test="deliveryMethod != null">delivery_method = #{deliveryMethod},</if>
<if test="orderReceivingMode != null">order_receiving_mode = #{orderReceivingMode},</if>
<if test="customerContact != null">customer_contact = #{customerContact},</if>
<if test="customerFactory != null">customer_factory = #{customerFactory},</if>
<if test="contactNumber != null">contact_number = #{contactNumber},</if>
<if test="businessMembers != null">business_members = #{businessMembers},</if>
<if test="customerFax != null">customer_fax = #{customerFax},</if>
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
<if test="orderReceivingTime != null">order_receiving_time = #{orderReceivingTime},</if>
<if test="billingTime != null">billing_time = #{billingTime},</if>
<if test="customerRemarks != null">customer_remarks = #{customerRemarks},</if>
<if test="currentInventory != null">current_inventory = #{currentInventory},</if>
<if test="creditLimit != null">credit_limit = #{creditLimit},</if>
<if test="unpaidAmount != null">unpaid_amount = #{unpaidAmount},</if>
<if test="availableCredit != null">available_credit = #{availableCredit},</if>
<if test="confirmTax != null">confirm_tax = #{confirmTax},</if>
<if test="taxRate != null">tax_rate = #{taxRate},</if>
<if test="totalAmount != null">total_amount = #{totalAmount},</if>
<if test="modificationTime != null">modification_time = #{modificationTime},</if>
<if test="confirmTime != null">confirm_time = #{confirmTime},</if>
<if test="fileUpload != null">file_upload = #{fileUpload},</if>
<if test="confirmNo != null">confirm_no = #{confirmNo},</if>
<if test="confirmName != null">confirm_name = #{confirmName},</if>
<if test="auditNo != null">audit_no = #{auditNo},</if>
<if test="auditName != null">audit_name = #{auditName},</if>
<if test="auditTime != null">audit_time = #{auditTime},</if>
<if test="auditRemarks != null">audit_remarks = #{auditRemarks},</if>
<if test="nationalTaxBill != null">national_tax_bill = #{nationalTaxBill},</if>
<if test="finishProductCode != null">finish_product_code = #{finishProductCode},</if>
<if test="finishProductName != null">finish_product_name = #{finishProductName},</if>
<if test="specificationModel != null">specification_model = #{specificationModel},</if>
<if test="customerNumber != null">customer_number = #{customerNumber},</if>
<if test="typeMachine != null">type_machine = #{typeMachine},</if>
<if test="inventoryUnit != null">inventory_unit = #{inventoryUnit},</if>
<if test="stockUnitWeight != null">stock_unit_weight = #{stockUnitWeight},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
<if test="processPrice != null">process_price = #{processPrice},</if>
<if test="productQuantity != null">product_quantity = #{productQuantity},</if>
<if test="amountMoney != null">amount_money = #{amountMoney},</if>
<if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
<if test="line != null">line = #{line},</if>
<if test="versionNumber != null">version_number = #{versionNumber},</if>
<if test="salesExplain != null">sales_explain = #{salesExplain},</if>
<if test="customerUseOrNot != null">customer_use_or_not = #{customerUseOrNot},</if>
<if test="customerUseQuantity != null">customer_use_quantity = #{customerUseQuantity},</if>
<if test="customerUseRemarks != null">customer_use_remarks = #{customerUseRemarks},</if>
<if test="accountReconciliationOrNot != null">account_reconciliation_or_not = #{accountReconciliationOrNot},</if>
<if test="accountReconciliationPerson != null">account_reconciliation_person = #{accountReconciliationPerson},</if>
<if test="accountReconciliationTime != null">account_reconciliation_time = #{accountReconciliationTime},</if>
</trim>
where sales_finish_id = #{salesFinishId}
</update>
<delete id="deleteSalesOrderDetailById" parameterType="Long">
delete from sales_order_detail where sales_finish_id = #{salesFinishId}
</delete>
<delete id="deleteSalesOrderDetailByIds" parameterType="String">
delete from sales_order_detail where sales_finish_id in
<foreach item="salesFinishId" collection="array" open="(" separator="," close=")">
#{salesFinishId}
</foreach>
</delete>
</mapper>

68
ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml

@ -54,23 +54,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sopCode != null and sopCode != ''">sop_code,</if>
<if test="sopName != null and sopName != ''">sop_name,</if>
<if test="sopModel != null">sop_model,</if>
<if test="typeOfMachine != null">type_of_machine,</if>
<if test="sopUnit != null">sop_unit,</if>
<if test="drawingFile != null">drawing_file,</if>
<if test="workhourFile != null">workhour_file,</if>
<if test="sopFile != null">sop_file,</if>
<if test="sipFile != null">sip_file,</if>
<if test="sppFile != null">spp_file,</if>
<if test="bomFile != null">bom_file,</if>
<if test="customerFile != null">customer_file,</if>
<if test="otherFile != null">other_file,</if>
<if test="customerCode != null">customer_code,</if>
<if test="customerName != null">customer_name,</if>
<if test="dateOfRegistration != null">date_of_registration,</if>
<if test="sopRegistrant != null">sop_registrant,</if>
<if test="sopRemark != null">sop_remark,</if>
<if test="currentVersion != null">current_version,</if>
<if test="sopModel != null and sopModel != ''">sop_model,</if>
<if test="typeOfMachine != null and typeOfMachine != ''">type_of_machine,</if>
<if test="sopUnit != null and sopUnit != ''">sop_unit,</if>
<if test="drawingFile != null and drawingFile != ''">drawing_file,</if>
<if test="workhourFile != null and workhourFile != ''">workhour_file,</if>
<if test="sopFile != null and sopFile != ''">sop_file,</if>
<if test="sipFile != null and sipFile != ''">sip_file,</if>
<if test="sppFile != null and sppFile != ''">spp_file,</if>
<if test="bomFile != null and bomFile != ''">bom_file,</if>
<if test="customerFile != null and customerFile != ''">customer_file,</if>
<if test="otherFile != null and otherFile != ''">other_file,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
<if test="dateOfRegistration != null and dateOfRegistration != ''">date_of_registration,</if>
<if test="sopRegistrant != null and sopRegistrant != ''">sop_registrant,</if>
<if test="sopRemark != null and sopRemark != ''">sop_remark,</if>
<if test="currentVersion != null and currentVersion != ''">current_version,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -102,23 +102,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="sopCode != null and sopCode != ''">sop_code = #{sopCode},</if>
<if test="sopName != null and sopName != ''">sop_name = #{sopName},</if>
<if test="sopModel != null">sop_model = #{sopModel},</if>
<if test="typeOfMachine != null">type_of_machine = #{typeOfMachine},</if>
<if test="sopUnit != null">sop_unit = #{sopUnit},</if>
<if test="drawingFile != null">drawing_file = #{drawingFile},</if>
<if test="workhourFile != null">workhour_file = #{workhourFile},</if>
<if test="sopFile != null">sop_file = #{sopFile},</if>
<if test="sipFile != null">sip_file = #{sipFile},</if>
<if test="sppFile != null">spp_file = #{sppFile},</if>
<if test="bomFile != null">bom_file = #{bomFile},</if>
<if test="customerFile != null">customer_file = #{customerFile},</if>
<if test="otherFile != null">other_file = #{otherFile},</if>
<if test="customerCode != null">customer_code = #{customerCode},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="dateOfRegistration != null">date_of_registration = #{dateOfRegistration},</if>
<if test="sopRegistrant != null">sop_registrant = #{sopRegistrant},</if>
<if test="sopRemark != null">sop_remark = #{sopRemark},</if>
<if test="currentVersion != null">current_version = #{currentVersion},</if>
<if test="sopModel != null and sopModel != ''">sop_model = #{sopModel},</if>
<if test="typeOfMachine != null and typeOfMachine != ''">type_of_machine = #{typeOfMachine},</if>
<if test="sopUnit != null and sopUnit != ''">sop_unit = #{sopUnit},</if>
<if test="drawingFile != null and drawingFile != ''">drawing_file = #{drawingFile},</if>
<if test="workhourFile != null and workhourFile != ''">workhour_file = #{workhourFile},</if>
<if test="sopFile != null and sopFile != ''">sop_file = #{sopFile},</if>
<if test="sipFile != null and sipFile != ''">sip_file = #{sipFile},</if>
<if test="sppFile != null and sppFile != ''">spp_file = #{sppFile},</if>
<if test="bomFile != null and bomFile != ''">bom_file = #{bomFile},</if>
<if test="customerFile != null and customerFile != ''">customer_file = #{customerFile},</if>
<if test="otherFile != null and otherFile != ''">other_file = #{otherFile},</if>
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
<if test="dateOfRegistration != null and dateOfRegistration != ''">date_of_registration = #{dateOfRegistration},</if>
<if test="sopRegistrant != null and sopRegistrant != ''">sop_registrant = #{sopRegistrant},</if>
<if test="sopRemark != null and sopRemark != ''">sop_remark = #{sopRemark},</if>
<if test="currentVersion != null and currentVersion != ''">current_version = #{currentVersion},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where sop_id = #{sopId}

245
ruoyi-admin/src/main/resources/mapper/taxInvoice/FinanceRequestFundsMapper.xml

@ -0,0 +1,245 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.taxInvoice.mapper.FinanceRequestFundsMapper">
<resultMap type="FinanceRequestFunds" id="FinanceRequestFundsResult">
<result property="requestFundsId" column="request_funds_id" />
<result property="requestFundsNumber" column="request_funds_number" />
<result property="requestFundsTime" column="request_funds_time" />
<result property="commonCurrency" column="common_currency" />
<result property="requestPerson" column="request_person" />
<result property="agreedPaymentDeadline" column="agreed_payment_deadline" />
<result property="supplierCode" column="supplier_code" />
<result property="supplierName" column="supplier_name" />
<result property="depositBank" column="deposit_bank" />
<result property="bankAccount" column="bank_account" />
<result property="periodOfPayment" column="period_of_payment" />
<result property="requestReasonCategory" column="request_reason_category" />
<result property="requestFundsDept" column="request_funds_dept" />
<result property="invoiceCategory" column="invoice_category" />
<result property="paymentTerms" column="payment_terms" />
<result property="paymentWay" column="payment_way" />
<result property="requestAmountTotal" column="request_amount_total" />
<result property="monthRequestTotal" column="month_request_total" />
<result property="amountUppercase" column="amount_uppercase" />
<result property="paymentMatters" column="payment_matters" />
<result property="remarks" column="remarks" />
<result property="supervisorApprovalFlag" column="supervisor_approval_flag" />
<result property="supervisorApproval" column="supervisor_approval" />
<result property="supervisorApprovalTime" column="supervisor_approval_time" />
<result property="finanaceSupervisorApprovalFlag" column="finanace_supervisor_approval_flag" />
<result property="finanaceSupervisorApproval" column="finanace_supervisor_approval" />
<result property="finanaceSupervisorApprovalTime" column="finanace_supervisor_approval_time" />
<result property="deputyGeneralManagerApprovalFlag" column="deputy_general_manager_approval_flag" />
<result property="deputyGeneralManagerApproval" column="deputy_general_manager_approval" />
<result property="deputyGeneralManagerApprovalTime" column="deputy_general_manager_approval_time" />
<result property="generalManagerApprovalFlag" column="general_manager_approval_flag" />
<result property="generalManagerApproval" column="general_manager_approval" />
<result property="generalManagerApprovalTime" column="general_manager_approval_time" />
<result property="paidAccountingCashierFlag" column="paid_accounting_cashier_flag" />
<result property="paidAccountingCashier" column="paid_accounting_cashier" />
<result property="paymentCompletionTime" column="payment_completion_time" />
<result property="paidInAmount" column="paid_in_amount" />
<result property="deductionAmount" column="deduction_amount" />
<result property="closeCaseFlag" column="close_case_flag" />
<result property="firstAddTime" column="first_add_time" />
<result property="updateInfoTime" column="update_info_time" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
<result property="standbyThree" column="standby_three" />
<result property="standbyFour" column="standby_four" />
</resultMap>
<sql id="selectFinanceRequestFundsVo">
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
</sql>
<select id="selectFinanceRequestFundsList" parameterType="FinanceRequestFunds" resultMap="FinanceRequestFundsResult">
<include refid="selectFinanceRequestFundsVo"/>
<where>
<if test="requestFundsNumber != null and requestFundsNumber != ''"> and request_funds_number like concat('%', #{requestFundsNumber}, '%')</if>
<if test="params.beginRequestFundsTime != null and params.beginRequestFundsTime != '' and params.endRequestFundsTime != null and params.endRequestFundsTime != ''"> and request_funds_time between #{params.beginRequestFundsTime} and #{params.endRequestFundsTime}</if>
<if test="commonCurrency != null and commonCurrency != ''"> and common_currency = #{commonCurrency}</if>
<if test="requestPerson != null and requestPerson != ''"> and request_person like concat('%', #{requestPerson}, '%')</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="periodOfPayment != null and periodOfPayment != ''"> and period_of_payment = #{periodOfPayment}</if>
<if test="requestReasonCategory != null and requestReasonCategory != ''"> and request_reason_category = #{requestReasonCategory}</if>
<if test="invoiceCategory != null and invoiceCategory != ''"> and invoice_category = #{invoiceCategory}</if>
<if test="supervisorApprovalFlag != null and supervisorApprovalFlag != ''"> and supervisor_approval_flag = #{supervisorApprovalFlag}</if>
<if test="supervisorApproval != null and supervisorApproval != ''"> and supervisor_approval like concat('%', #{supervisorApproval}, '%')</if>
<if test="finanaceSupervisorApprovalFlag != null and finanaceSupervisorApprovalFlag != ''"> and finanace_supervisor_approval_flag = #{finanaceSupervisorApprovalFlag}</if>
<if test="finanaceSupervisorApproval != null and finanaceSupervisorApproval != ''"> and finanace_supervisor_approval like concat('%', #{finanaceSupervisorApproval}, '%')</if>
<if test="deputyGeneralManagerApprovalFlag != null and deputyGeneralManagerApprovalFlag != ''"> and deputy_general_manager_approval_flag = #{deputyGeneralManagerApprovalFlag}</if>
<if test="deputyGeneralManagerApproval != null and deputyGeneralManagerApproval != ''"> and deputy_general_manager_approval like concat('%', #{deputyGeneralManagerApproval}, '%')</if>
<if test="generalManagerApprovalFlag != null and generalManagerApprovalFlag != ''"> and general_manager_approval_flag = #{generalManagerApprovalFlag}</if>
<if test="generalManagerApproval != null and generalManagerApproval != ''"> and general_manager_approval like concat('%', #{generalManagerApproval}, '%')</if>
<if test="paidAccountingCashierFlag != null and paidAccountingCashierFlag != ''"> and paid_accounting_cashier_flag = #{paidAccountingCashierFlag}</if>
<if test="paidAccountingCashier != null and paidAccountingCashier != ''"> and paid_accounting_cashier like concat('%', #{paidAccountingCashier}, '%')</if>
<if test="closeCaseFlag != null and closeCaseFlag != ''"> and close_case_flag = #{closeCaseFlag}</if>
</where>
</select>
<select id="selectFinanceRequestFundsById" parameterType="Integer" resultMap="FinanceRequestFundsResult">
<include refid="selectFinanceRequestFundsVo"/>
where request_funds_id = #{requestFundsId}
</select>
<insert id="insertFinanceRequestFunds" parameterType="FinanceRequestFunds" useGeneratedKeys="true" keyProperty="requestFundsId">
insert into finance_request_funds
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="requestFundsNumber != null and requestFundsNumber != ''">request_funds_number,</if>
<if test="requestFundsTime != null">request_funds_time,</if>
<if test="commonCurrency != null">common_currency,</if>
<if test="requestPerson != null">request_person,</if>
<if test="agreedPaymentDeadline != null">agreed_payment_deadline,</if>
<if test="supplierCode != null">supplier_code,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="depositBank != null">deposit_bank,</if>
<if test="bankAccount != null">bank_account,</if>
<if test="periodOfPayment != null">period_of_payment,</if>
<if test="requestReasonCategory != null">request_reason_category,</if>
<if test="requestFundsDept != null">request_funds_dept,</if>
<if test="invoiceCategory != null">invoice_category,</if>
<if test="paymentTerms != null">payment_terms,</if>
<if test="paymentWay != null">payment_way,</if>
<if test="requestAmountTotal != null">request_amount_total,</if>
<if test="monthRequestTotal != null">month_request_total,</if>
<if test="amountUppercase != null">amount_uppercase,</if>
<if test="paymentMatters != null">payment_matters,</if>
<if test="remarks != null">remarks,</if>
<if test="supervisorApprovalFlag != null">supervisor_approval_flag,</if>
<if test="supervisorApproval != null">supervisor_approval,</if>
<if test="supervisorApprovalTime != null">supervisor_approval_time,</if>
<if test="finanaceSupervisorApprovalFlag != null">finanace_supervisor_approval_flag,</if>
<if test="finanaceSupervisorApproval != null">finanace_supervisor_approval,</if>
<if test="finanaceSupervisorApprovalTime != null">finanace_supervisor_approval_time,</if>
<if test="deputyGeneralManagerApprovalFlag != null">deputy_general_manager_approval_flag,</if>
<if test="deputyGeneralManagerApproval != null">deputy_general_manager_approval,</if>
<if test="deputyGeneralManagerApprovalTime != null">deputy_general_manager_approval_time,</if>
<if test="generalManagerApprovalFlag != null">general_manager_approval_flag,</if>
<if test="generalManagerApproval != null">general_manager_approval,</if>
<if test="generalManagerApprovalTime != null">general_manager_approval_time,</if>
<if test="paidAccountingCashierFlag != null">paid_accounting_cashier_flag,</if>
<if test="paidAccountingCashier != null">paid_accounting_cashier,</if>
<if test="paymentCompletionTime != null">payment_completion_time,</if>
<if test="paidInAmount != null">paid_in_amount,</if>
<if test="deductionAmount != null">deduction_amount,</if>
<if test="closeCaseFlag != null">close_case_flag,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
<if test="standbyThree != null">standby_three,</if>
<if test="standbyFour != null">standby_four,</if>
first_add_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="requestFundsNumber != null and requestFundsNumber != ''">#{requestFundsNumber},</if>
<if test="requestFundsTime != null">#{requestFundsTime},</if>
<if test="commonCurrency != null">#{commonCurrency},</if>
<if test="requestPerson != null">#{requestPerson},</if>
<if test="agreedPaymentDeadline != null">#{agreedPaymentDeadline},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="depositBank != null">#{depositBank},</if>
<if test="bankAccount != null">#{bankAccount},</if>
<if test="periodOfPayment != null">#{periodOfPayment},</if>
<if test="requestReasonCategory != null">#{requestReasonCategory},</if>
<if test="requestFundsDept != null">#{requestFundsDept},</if>
<if test="invoiceCategory != null">#{invoiceCategory},</if>
<if test="paymentTerms != null">#{paymentTerms},</if>
<if test="paymentWay != null">#{paymentWay},</if>
<if test="requestAmountTotal != null">#{requestAmountTotal},</if>
<if test="monthRequestTotal != null">#{monthRequestTotal},</if>
<if test="amountUppercase != null">#{amountUppercase},</if>
<if test="paymentMatters != null">#{paymentMatters},</if>
<if test="remarks != null">#{remarks},</if>
<if test="supervisorApprovalFlag != null">#{supervisorApprovalFlag},</if>
<if test="supervisorApproval != null">#{supervisorApproval},</if>
<if test="supervisorApprovalTime != null">#{supervisorApprovalTime},</if>
<if test="finanaceSupervisorApprovalFlag != null">#{finanaceSupervisorApprovalFlag},</if>
<if test="finanaceSupervisorApproval != null">#{finanaceSupervisorApproval},</if>
<if test="finanaceSupervisorApprovalTime != null">#{finanaceSupervisorApprovalTime},</if>
<if test="deputyGeneralManagerApprovalFlag != null">#{deputyGeneralManagerApprovalFlag},</if>
<if test="deputyGeneralManagerApproval != null">#{deputyGeneralManagerApproval},</if>
<if test="deputyGeneralManagerApprovalTime != null">#{deputyGeneralManagerApprovalTime},</if>
<if test="generalManagerApprovalFlag != null">#{generalManagerApprovalFlag},</if>
<if test="generalManagerApproval != null">#{generalManagerApproval},</if>
<if test="generalManagerApprovalTime != null">#{generalManagerApprovalTime},</if>
<if test="paidAccountingCashierFlag != null">#{paidAccountingCashierFlag},</if>
<if test="paidAccountingCashier != null">#{paidAccountingCashier},</if>
<if test="paymentCompletionTime != null">#{paymentCompletionTime},</if>
<if test="paidInAmount != null">#{paidInAmount},</if>
<if test="deductionAmount != null">#{deductionAmount},</if>
<if test="closeCaseFlag != null">#{closeCaseFlag},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
<if test="standbyThree != null">#{standbyThree},</if>
<if test="standbyFour != null">#{standbyFour},</if>
now(),
</trim>
</insert>
<update id="updateFinanceRequestFunds" parameterType="FinanceRequestFunds">
update finance_request_funds
<trim prefix="SET" suffixOverrides=",">
<if test="requestFundsNumber != null and requestFundsNumber != ''">request_funds_number = #{requestFundsNumber},</if>
<if test="requestFundsTime != null">request_funds_time = #{requestFundsTime},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
<if test="requestPerson != null">request_person = #{requestPerson},</if>
<if test="agreedPaymentDeadline != null">agreed_payment_deadline = #{agreedPaymentDeadline},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="depositBank != null">deposit_bank = #{depositBank},</if>
<if test="bankAccount != null">bank_account = #{bankAccount},</if>
<if test="periodOfPayment != null">period_of_payment = #{periodOfPayment},</if>
<if test="requestReasonCategory != null">request_reason_category = #{requestReasonCategory},</if>
<if test="requestFundsDept != null">request_funds_dept = #{requestFundsDept},</if>
<if test="invoiceCategory != null">invoice_category = #{invoiceCategory},</if>
<if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
<if test="paymentWay != null">payment_way = #{paymentWay},</if>
<if test="requestAmountTotal != null">request_amount_total = #{requestAmountTotal},</if>
<if test="monthRequestTotal != null">month_request_total = #{monthRequestTotal},</if>
<if test="amountUppercase != null">amount_uppercase = #{amountUppercase},</if>
<if test="paymentMatters != null">payment_matters = #{paymentMatters},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="supervisorApprovalFlag != null">supervisor_approval_flag = #{supervisorApprovalFlag},</if>
<if test="supervisorApproval != null">supervisor_approval = #{supervisorApproval},</if>
<if test="supervisorApprovalTime != null">supervisor_approval_time = #{supervisorApprovalTime},</if>
<if test="finanaceSupervisorApprovalFlag != null">finanace_supervisor_approval_flag = #{finanaceSupervisorApprovalFlag},</if>
<if test="finanaceSupervisorApproval != null">finanace_supervisor_approval = #{finanaceSupervisorApproval},</if>
<if test="finanaceSupervisorApprovalTime != null">finanace_supervisor_approval_time = #{finanaceSupervisorApprovalTime},</if>
<if test="deputyGeneralManagerApprovalFlag != null">deputy_general_manager_approval_flag = #{deputyGeneralManagerApprovalFlag},</if>
<if test="deputyGeneralManagerApproval != null">deputy_general_manager_approval = #{deputyGeneralManagerApproval},</if>
<if test="deputyGeneralManagerApprovalTime != null">deputy_general_manager_approval_time = #{deputyGeneralManagerApprovalTime},</if>
<if test="generalManagerApprovalFlag != null">general_manager_approval_flag = #{generalManagerApprovalFlag},</if>
<if test="generalManagerApproval != null">general_manager_approval = #{generalManagerApproval},</if>
<if test="generalManagerApprovalTime != null">general_manager_approval_time = #{generalManagerApprovalTime},</if>
<if test="paidAccountingCashierFlag != null">paid_accounting_cashier_flag = #{paidAccountingCashierFlag},</if>
<if test="paidAccountingCashier != null">paid_accounting_cashier = #{paidAccountingCashier},</if>
<if test="paymentCompletionTime != null">payment_completion_time = #{paymentCompletionTime},</if>
<if test="paidInAmount != null">paid_in_amount = #{paidInAmount},</if>
<if test="deductionAmount != null">deduction_amount = #{deductionAmount},</if>
<if test="closeCaseFlag != null">close_case_flag = #{closeCaseFlag},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
<if test="standbyThree != null">standby_three = #{standbyThree},</if>
<if test="standbyFour != null">standby_four = #{standbyFour},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
</trim>
where request_funds_id = #{requestFundsId}
</update>
<delete id="deleteFinanceRequestFundsById" parameterType="Integer">
delete from finance_request_funds where request_funds_id = #{requestFundsId}
</delete>
<delete id="deleteFinanceRequestFundsByIds" parameterType="String">
delete from finance_request_funds where request_funds_id in
<foreach item="requestFundsId" collection="array" open="(" separator="," close=")">
#{requestFundsId}
</foreach>
</delete>
</mapper>

6
ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html

@ -61,9 +61,9 @@
<a class="btn btn-danger multiple disabled" onclick="removeSelected()" shiro:hasPermission="manufacture:deliveryGoodsNotice:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning single disabled" onclick="exportNotice()" shiro:hasPermission="manufacture:deliveryGoodsNotice:export">
<i class="fa fa-download"></i> 导出
</a>
<!-- <a class="btn btn-warning single disabled" onclick="exportNotice()" shiro:hasPermission="manufacture:deliveryGoodsNotice:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space: nowrap"></table>

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

134
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html

@ -1,11 +1,12 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增销售记录')" />
<th:block th:include="include :: header('新增销售订单查询')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-salesAccountReconciliation-add">
<form class="form-horizontal m" id="form-salesOrderDetail-add">
<div class="form-group">
<label class="col-sm-3 control-label">订单编号:</label>
<div class="col-sm-8">
@ -18,28 +19,16 @@
<input name="salesOrderNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">预约单号:</label>
<div class="col-sm-8">
<input name="appointmentNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<select name="enterpriseCode" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
<input name="enterpriseCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<select name="enterpriseName" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
<input name="enterpriseName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -105,7 +94,10 @@
<div class="form-group">
<label class="col-sm-3 control-label">接单日期:</label>
<div class="col-sm-8">
<input name="orderReceivingTime" class="form-control" type="text">
<div class="input-group date">
<input name="orderReceivingTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
@ -174,6 +166,12 @@
<input name="confirmTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件存储:</label>
<div class="col-sm-8">
<input name="fileUpload" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">确认否:</label>
<div class="col-sm-8">
@ -187,57 +185,29 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核否:</label>
<label class="col-sm-3 control-label">结案否:</label>
<div class="col-sm-8">
<input name="auditNo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核人:</label>
<label class="col-sm-3 control-label">结案人:</label>
<div class="col-sm-8">
<input name="auditName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核时间:</label>
<label class="col-sm-3 control-label">结案时间:</label>
<div class="col-sm-8">
<input name="auditTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核备注:</label>
<label class="col-sm-3 control-label">结案备注:</label>
<div class="col-sm-8">
<input name="auditRemarks" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用否:</label>
<div class="col-sm-8">
<select name="customerUseOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否:</label>
<div class="col-sm-8">
<select name="accountReconciliationOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人:</label>
<div class="col-sm-8">
<input name="accountReconciliationPerson" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间:</label>
<div class="col-sm-8">
<input name="accountReconciliationTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否开国税发票:</label>
<div class="col-sm-8">
@ -262,6 +232,12 @@
<input name="specificationModel" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户料号:</label>
<div class="col-sm-8">
<input name="customerNumber" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
@ -277,7 +253,16 @@
<div class="form-group">
<label class="col-sm-3 control-label">重量:</label>
<div class="col-sm-8">
<input name="stockUnitWeight" class="form-control" type="text">
<select name="stockUnitWeight" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">币别:</label>
<div class="col-sm-8">
<input name="commonCurrency" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -322,20 +307,63 @@
<input name="salesExplain" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用否:</label>
<div class="col-sm-8">
<input name="customerUseOrNot" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用数量:</label>
<div class="col-sm-8">
<input name="customerUseQuantity" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用备注说明:</label>
<div class="col-sm-8">
<input name="customerUseRemarks" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否:</label>
<div class="col-sm-8">
<input name="accountReconciliationOrNot" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人:</label>
<div class="col-sm-8">
<input name="accountReconciliationPerson" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间:</label>
<div class="col-sm-8">
<input name="accountReconciliationTime" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "salesAccountReconciliation/salesAccountReconciliation"
$("#form-salesAccountReconciliation-add").validate({
var prefix = ctx + "sales/salesOrderDetail"
$("#form-salesOrderDetail-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-salesAccountReconciliation-add').serialize());
$.operate.save(prefix + "/add", $('#form-salesOrderDetail-add').serialize());
}
}
$("input[name='orderReceivingTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

136
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html

@ -1,12 +1,13 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改销售记录')" />
<th:block th:include="include :: header('修改销售订单查询')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-salesAccountReconciliation-edit" th:object="${salesAccountReconciliation}">
<input name="salesOrderCode" th:field="*{salesOrderCode}" type="hidden">
<form class="form-horizontal m" id="form-salesOrderDetail-edit" th:object="${salesOrderDetail}">
<input name="salesFinishId" th:field="*{salesFinishId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">订单编号:</label>
<div class="col-sm-8">
@ -19,28 +20,16 @@
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">预约单号:</label>
<div class="col-sm-8">
<input name="appointmentNumber" th:field="*{appointmentNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<select name="enterpriseCode" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<select name="enterpriseName" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -106,7 +95,10 @@
<div class="form-group">
<label class="col-sm-3 control-label">接单日期:</label>
<div class="col-sm-8">
<input name="orderReceivingTime" th:field="*{orderReceivingTime}" class="form-control" type="text">
<div class="input-group date">
<input name="orderReceivingTime" th:value="${#dates.format(salesOrderDetail.orderReceivingTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
@ -175,6 +167,12 @@
<input name="confirmTime" th:field="*{confirmTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">文件存储:</label>
<div class="col-sm-8">
<input name="fileUpload" th:field="*{fileUpload}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">确认否:</label>
<div class="col-sm-8">
@ -188,57 +186,29 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核否:</label>
<label class="col-sm-3 control-label">结案否:</label>
<div class="col-sm-8">
<input name="auditNo" th:field="*{auditNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核人:</label>
<label class="col-sm-3 control-label">结案人:</label>
<div class="col-sm-8">
<input name="auditName" th:field="*{auditName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核时间:</label>
<label class="col-sm-3 control-label">结案时间:</label>
<div class="col-sm-8">
<input name="auditTime" th:field="*{auditTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核备注:</label>
<label class="col-sm-3 control-label">结案备注:</label>
<div class="col-sm-8">
<input name="auditRemarks" th:field="*{auditRemarks}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用否:</label>
<div class="col-sm-8">
<select name="customerUseOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{customerUseOrNot}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否:</label>
<div class="col-sm-8">
<select name="accountReconciliationOrNot" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{accountReconciliationOrNot}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人:</label>
<div class="col-sm-8">
<input name="accountReconciliationPerson" th:field="*{accountReconciliationPerson}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间:</label>
<div class="col-sm-8">
<input name="accountReconciliationTime" th:field="*{accountReconciliationTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否开国税发票:</label>
<div class="col-sm-8">
@ -263,6 +233,12 @@
<input name="specificationModel" th:field="*{specificationModel}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户料号:</label>
<div class="col-sm-8">
<input name="customerNumber" th:field="*{customerNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">机种:</label>
<div class="col-sm-8">
@ -278,7 +254,16 @@
<div class="form-group">
<label class="col-sm-3 control-label">重量:</label>
<div class="col-sm-8">
<input name="stockUnitWeight" th:field="*{stockUnitWeight}" class="form-control" type="text">
<select name="stockUnitWeight" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">币别:</label>
<div class="col-sm-8">
<input name="commonCurrency" th:field="*{commonCurrency}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -323,20 +308,63 @@
<input name="salesExplain" th:field="*{salesExplain}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用否:</label>
<div class="col-sm-8">
<input name="customerUseOrNot" th:field="*{customerUseOrNot}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用数量:</label>
<div class="col-sm-8">
<input name="customerUseQuantity" th:field="*{customerUseQuantity}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户使用备注说明:</label>
<div class="col-sm-8">
<input name="customerUseRemarks" th:field="*{customerUseRemarks}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账否:</label>
<div class="col-sm-8">
<input name="accountReconciliationOrNot" th:field="*{accountReconciliationOrNot}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账人:</label>
<div class="col-sm-8">
<input name="accountReconciliationPerson" th:field="*{accountReconciliationPerson}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">对账时间:</label>
<div class="col-sm-8">
<input name="accountReconciliationTime" th:field="*{accountReconciliationTime}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "salesAccountReconciliation/salesAccountReconciliation";
$("#form-salesAccountReconciliation-edit").validate({
var prefix = ctx + "sales/salesOrderDetail";
$("#form-salesOrderDetail-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-salesAccountReconciliation-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-salesOrderDetail-edit').serialize());
}
}
$("input[name='orderReceivingTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

708
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html

@ -1,45 +1,42 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('销售对账列表')" />
<th:block th:include="include :: header('销售订单查询列表')" />
<th:block th:include="include :: datetimepicker-css"/>
<style>
.table-striped{
border: 0px!important;
white-space:nowrap;
}
</style>
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li class="select-time">
<label>创建时间: </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<label>接单日期:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderReceivingTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderReceivingTime]"/>
</li>
<!-- <li>-->
<!-- <label>订单编号:</label>-->
<!-- <input type="text" name="salesOrderCode"/>-->
<!-- </li>-->
<li>
<label>订单号码:</label>
<input type="text" name="salesOrderNumber"/>
</li>
<!-- <li>-->
<!-- <label>客户代码:</label>-->
<!-- <input type="text" name="enterpriseCode"/>-->
<!-- </li>-->
<li>
<label>客户代码:</label>
<select name="enterpriseCode">
<option value="">所有</option>
</select>
<label>客户名称:</label>
<input type="text" name="enterpriseName"/>
</li>
<li>
<label>客户名称:</label>
<select name="enterpriseName">
<option value="">所有</option>
</select>
<label>接单方式:</label>
<input type="text" name="orderReceivingMode"/>
</li>
<li>
<label>成品代码:</label>
@ -50,8 +47,17 @@
<input type="text" name="finishProductName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchAll()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="resetAll()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<label>币别:</label>
<!-- <input type="text" name="commonCurrency"/>-->
<select name="commonCurrency" th:with="type=${@dict.getType('sys_common_currency')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
@ -59,314 +65,402 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sales:salesOrderDetail:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="sales:salesOrderDetail:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<b>销售订单详情</b>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="salesAccountReconciliation:salesAccountReconciliation:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sales:salesOrderDetail:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<a class="btn btn-warning" onclick="exportDatas()" shiro:hasPermission="sales:salesOrderDetail:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped" style="white-space: nowrap;">
<table id="bootstrap-table"></table>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space: nowrap"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('sales:salesAccountReconciliation:edit')}]];
var removeFlag = [[${@permission.hasPermi('sales:salesAccountReconciliation:remove')}]];
var customerUseOrNotDatas = [[${@dict.getType('sys_whether')}]];
var accountReconciliationOrNotDatas = [[${@dict.getType('sys_whether')}]];
var nationalTaxBillDatas = [[${@dict.getType('sys_whether')}]];
var inventoryUnitDatas = [[${@dict.getType('sys_unit_class')}]];
var commonCurrencyDatas = [[${@dict.getType('sys_coin_class')}]];
var prefix = ctx + "sales/salesAccountReconciliation";
var editFlag = [[${@permission.hasPermi('sales:salesOrderDetail:edit')}]];
var removeFlag = [[${@permission.hasPermi('sales:salesOrderDetail:remove')}]];
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
var whetherDatas = [[${@dict.getType('sys_whether')}]];
var prefix = ctx + "sales/salesOrderDetail";
$(function() {
/*显示销售列表数据*/
var options = {
id: "bootstrap-table",
formId: "formId",
toolbar: "toolbar",
url: prefix + '/list',
exportUrl: prefix + '/export',
clickToSelect: true,
modalName: "销售d",
columns: [{
checkbox: true
},
{
field: 'salesFinishId',
title: '订单id',
visible: false
},
{
field: 'salesOrderCode',
title: '订单编号',
visible: false
},
{
field: 'salesOrderNumber',
title: '订单号码'
},
{
field: 'appointmentNumber',
title: '预约单号',
visible: false
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'paymentTerms',
title: '付款条件',
visible: false
},
{
field: 'deliveryConditions',
title: '交货条件',
visible: false
},
{
field: 'deliveryMethod',
title: '交货方式',
visible: false
},
{
field: 'orderReceivingMode',
title: '接单方式',
visible: false
},
{
field: 'customerContact',
title: '联系人'
},
{
field: 'customerFactory',
title: '客户厂区',
visible: false
},
{
field: 'contactNumber',
title: '联系电话',
visible: false
},
{
field: 'businessMembers',
title: '业务人员',
visible: false
},
{
field: 'customerFax',
title: '传真号码',
visible: false
},
{
field: 'deliveryAddress',
title: '交货地点',
visible: false
},
{
field: 'orderReceivingTime',
title: '接单日期',
visible: false
},
{
field: 'billingTime',
title: '开单日期时间',
visible: false
},
{
field: 'customerRemarks',
title: '备注内容',
visible: false
},
{
field: 'currentInventory',
title: '当前库存数',
visible: false
},
{
field: 'creditLimit',
title: '信用额度',
visible: false
},
{
field: 'unpaidAmount',
title: '未付款数',
visible: false
},
{
field: 'availableCredit',
title: '可用额度',
visible: false
},
{
field: 'confirmTax',
title: '是否含税',
visible: false
},
{
field: 'taxRate',
title: '税率',
visible: false
},
{
field: 'totalAmount',
title: '合计金额',
visible: false
},
{
field: 'modificationTime',
title: '修改日期',
visible: false
},
{
field: 'confirmTime',
title: '确认日期',
visible: false
},
{
field: 'confirmNo',
title: '确认否',
visible: false
},
{
field: 'confirmName',
title: '确认人',
visible: false
},
{
field: 'auditNo',
title: '审核否',
visible: false
},
{
field: 'auditName',
title: '审核人',
visible: false
},
{
field: 'auditTime',
title: '审核时间',
visible: false
},
{
field: 'auditRemarks',
title: '审核备注',
visible: false
},
{
field: 'specificationModel',
title: '规格型号',
visible: false
},
{
field: 'typeMachine',
title: '机种',
visible: false
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'stockUnitWeight',
title: '重量',
visible: false
},
{
field: 'processPrice',
title: '单价'
},
{
field: 'productQuantity',
title: '数量'
},
{
field: 'amountMoney',
title: '金额'
url: prefix + "/list",
// createUrl: prefix + "/add",
// updateUrl: prefix + "/edit/{id}",
// removeUrl: prefix + "/remove",
// exportUrl: prefix + "/export",
modalName: "销售订单查询",
columns: [
// {
// checkbox: true
// },
{
field: 'salesFinishId',
title: '订单id',
visible: false
},
{
field: 'salesOrderCode',
title: '订单编号'
},
{
field: 'salesOrderNumber',
title: '订单号码'
},
{
field: 'enterpriseCode',
title: '客户代码'
},
{
field: 'enterpriseName',
title: '客户名称'
},
{
field: 'paymentTerms',
title: '付款条件'
},
{
field: 'deliveryConditions',
title: '交货条件'
},
{
field: 'deliveryMethod',
title: '交货方式'
},
{
field: 'orderReceivingMode',
title: '接单方式'
},
{
field: 'customerContact',
title: '联系人'
},
{
field: 'customerFactory',
title: '客户厂区'
},
{
field: 'contactNumber',
title: '联系电话'
},
{
field: 'businessMembers',
title: '业务人员'
},
{
field: 'customerFax',
title: '传真号码'
},
{
field: 'deliveryAddress',
title: '交货地点'
},
{
field: 'orderReceivingTime',
title: '接单日期'
},
{
field: 'billingTime',
title: '开单日期时间'
},
{
field: 'customerRemarks',
title: '备注内容'
},
{
field: 'currentInventory',
title: '当前库存数',
visible: false
},
{
field: 'creditLimit',
title: '信用额度',
visible: false
},
{
field: 'unpaidAmount',
title: '未付款数',
visible: false
},
{
field: 'availableCredit',
title: '可用额度',
visible: false
},
{
field: 'confirmTax',
title: '是否含税',
visible: false
},
{
field: 'taxRate',
title: '税率',
visible: false
},
{
field: 'totalAmount',
title: '合计金额',
visible: false
},
{
field: 'modificationTime',
title: '修改日期',
visible: false
},
{
field: 'confirmTime',
title: '确认日期',
visible: false
},
{
field: 'fileUpload',
title: '文件存储',
visible: false
},
{
field: 'confirmNo',
title: '确认否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
{
field: 'deliveryTime',
title: '交期',
visible: false
visible: false
},
{
field: 'confirmName',
title: '确认人',
visible: false
},
{
field: 'auditNo',
title: '结案否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
{
field: 'line',
title: 'Line#',
visible: false
visible: false
},
{
field: 'auditName',
title: '结案人',
visible: false
},
{
field: 'auditTime',
title: '结案时间',
visible: false
},
{
field: 'auditRemarks',
title: '结案备注',
visible: false
},
{
field: 'nationalTaxBill',
title: '是否开国税发票',
visible: false
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'customerNumber',
title: '客户料号'
},
{
field: 'typeMachine',
title: '机种'
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'stockUnitWeight',
title: '重量'
},
{
field: 'commonCurrency',
title: '币别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(commonCurrencyDatas, value);
}
},
{
field: 'processPrice',
title: '单价'
},
{
field: 'productQuantity',
title: '数量'
},
{
field: 'amountMoney',
title: '金额'
},
{
field: 'deliveryTime',
title: '交期'
},
{
field: 'line',
title: 'Line#'
},
{
field: 'versionNumber',
title: '版本号'
},
{
field: 'salesExplain',
title: '说明'
},
{
field: 'customerUseOrNot',
title: '客户使用否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
{
field: 'versionNumber',
title: '版本号',
visible: false
visible: false
},
{
field: 'customerUseQuantity',
title: '客户使用数量',
visible: false
},
{
field: 'customerUseRemarks',
title: '客户使用备注说明',
visible: false
},
{
field: 'accountReconciliationOrNot',
title: '对账否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
{
field: 'salesExplain',
title: '说明',
visible: false
}]
visible: false
},
{
field: 'accountReconciliationPerson',
title: '对账人',
visible: false
},
{
field: 'accountReconciliationTime',
title: '对账时间',
visible: false
}]
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.salesFinishId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.salesFinishId + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }]
};
$.table.init(options);
/*获取客户信息*/
getCustomerList();
});
/*表单搜索*/
function searchAll() {
$.table.search('formId','bootstrap-table');
}
// $.ajax({
// url: prefix + "/getCustomerList",
// type: "POST",
// success: function (res) {
// //console.log(res)
// if (res.length > 0) {
// customerListData = res;
// //alert(JSON.stringify(data));
// for (let i in customerListData) {
// $("select[name='enterpriseCode']").append("<option value='" + customerListData[i].enterpriseCode + "'>" + customerListData[i].enterpriseCode + "</option>");
// $("select[name='enterpriseName']").append("<option value='" + customerListData[i].enterpriseName + "'>" + customerListData[i].enterpriseName + "</option>");
// }
//
// } else {
// $.modal.msgError(res.msg);
// }
// },
// error: function () {
// $.modal.msgError("后台出错啦!");
//
// }
// })
/*表单重置*/
function resetAll() {
$.form.reset('formId','bootstrap-table');
}
/*获取客户信息*/
function getCustomerList() {
$.ajax({
url: prefix + "/getCustomerList",
type: "POST",
success: function (res) {
//console.log(res)
if (res.length > 0) {
customerListData = res;
//alert(JSON.stringify(data));
for (let i in customerListData) {
$("select[name='enterpriseCode']").append("<option value='" + customerListData[i].enterpriseCode + "'>" + customerListData[i].enterpriseCode + "</option>");
$("select[name='enterpriseName']").append("<option value='" + customerListData[i].enterpriseName + "'>" + customerListData[i].enterpriseName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
//导出
function exportDatas() {
// var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
// console.log(rows)
var data = $("#bootstrap-table").bootstrapTable("getData")
console.log(data)
$.modal.confirm('确认以上查询参数是否正确?', function () {
let startTime = $("#formId input[name='params[beginOrderReceivingTime]']").val()
let endTime = $("#formId input[name='params[endOrderReceivingTime]']").val()
let salesOrderNumber = $("#formId input[name='salesOrderNumber']").val()
let enterpriseName = $("#formId input[name='enterpriseName']").val()
let orderReceivingMode = $("#formId input[name='orderReceivingMode']").val()
let finishProductCode = $("#formId input[name='finishProductCode']").val()
let finishProductName = $("#formId input[name='finishProductName']").val()
let commonCurrency = $("#formId select[name='commonCurrency']").val()
var ids = [];
for (let i=0;i<data.length;i++) {
ids.push(data[i].salesFinishId)
}
// console.log(ids)
// console.log(ids.join())
$.modal.confirm("确认要导出订单查询明细吗?", function (){
axios({
url: prefix + '/exportDatas/'+ ids.join(),
method: 'POST',
params: {
startTime: startTime,
endTime: endTime,
salesOrderNumber: salesOrderNumber,
enterpriseName: enterpriseName,
orderReceivingMode: orderReceivingMode,
finishProductCode: finishProductCode,
finishProductName: finishProductName,
commonCurrency: commonCurrency
},
responseType: 'blob'
}).then(response => {
// sendSearchParameter(supplierCode, supplierName);
// console.log(response)
const URL = window.URL.createObjectURL(response.data)
// 创建隐藏<a>标签进行下载
const tempLink = document.createElement('a')
tempLink.style.display = 'none'
tempLink.href = URL
let time = new Date().toLocaleString()
tempLink.setAttribute('download', time + "订单查询明细.xlsx")
if (typeof tempLink.download === 'undefined') {
tempLink.setAttribute('target', '_blank')
}
document.body.appendChild(tempLink)
tempLink.click()
document.body.removeChild(tempLink)// 移除dom元素
window.URL.revokeObjectURL(URL)//释放内存
})
});
})
}
</script>
</body>
</html>

1
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',

48
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
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('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
if (value !== null) {
var filepath = value.substring(value.lastIndexOf("/")+1)
actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
}
return actions.join('');
}
},

420
ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/add.html

@ -0,0 +1,420 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增付款申请单')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
<th:block th:include="include :: bootstrap-editable-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-financeRequestFunds-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">申请单号:</label>
<div class="col-sm-8">
<input name="requestFundsNumber" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请日期时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="requestFundsTime" class="form-control" placeholder="yyyy-mm-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">币别:</label>
<div class="col-sm-8">
<select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请人:</label>
<div class="col-sm-8">
<input name="requestPerson" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">约定付款期限:</label>
<div class="col-sm-8">
<!-- <input name="agreedPaymentDeadline" class="form-control" type="text">-->
<div class="input-group date">
<input name="agreedPaymentDeadline" class="form-control" placeholder="yyyy-mm-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">厂商代码:</label>
<div class="col-sm-8">
<!-- <input name="supplierCode" class="form-control" type="text">-->
<select name="supplierCode" class="form-control m-b" >
<option value="">请选择厂商代码</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">厂商名称:</label>
<div class="col-sm-8">
<input name="supplierName" class="form-control" type="text">
<!-- <select name="supplierName" class="form-control m-b" >-->
<!-- <option value="">请选择厂商名称</option>-->
<!-- </select>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开户银行:</label>
<div class="col-sm-8">
<input name="depositBank" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">银行账号:</label>
<div class="col-sm-8">
<input name="bankAccount" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">款项所属期:</label>
<div class="col-sm-8">
<!-- <select name="periodOfPayment" class="form-control m-b">-->
<!-- <option value="">所有</option>-->
<!-- </select>-->
<div class="input-group date">
<input name="periodOfPayment" class="form-control" placeholder="yyyymm" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款源由类别:</label>
<div class="col-sm-8">
<select name="requestReasonCategory" class="form-control m-b" th:with="type=${@dict.getType('request_reason_category')}">
<option value="">请选择请款源由类别</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款部门:</label>
<div class="col-sm-8">
<!-- <input name="requestFundsDept" class="form-control" type="text">-->
<select name="requestFundsDept" class="form-control m-b" >
<option value="">请选择请款部门</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发票类别:</label>
<div class="col-sm-8">
<select name="invoiceCategory" class="form-control m-b" th:with="type=${@dict.getType('invoice_category')}">
<option value="">请选择发票类别</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款条件:</label>
<div class="col-sm-8">
<input name="paymentTerms" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款方式:</label>
<div class="col-sm-8">
<!-- <input name="paymentWay" class="form-control" type="text">-->
<select name="paymentWay" class="form-control m-b" th:with="type=${@dict.getType('payment_way')}">
<option value="">请选择付款方式</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款金额合计:</label>
<div class="col-sm-8">
<input name="requestAmountTotal" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">本月请款合计:</label>
<div class="col-sm-8">
<input name="monthRequestTotal" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">金额(大写):</label>
<div class="col-sm-8">
<input name="amountUppercase" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款事项:</label>
<div class="col-sm-8">
<textarea name="paymentMatters" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control"></textarea>
</div>
</div>
<div class="form-group hidden">
<label class="col-sm-3 control-label">主管审批否:</label>
<div class="col-sm-8">
<select name="supervisorApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批主管名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="supervisorApproval" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">主管审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="supervisorApprovalTime" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">财务主管审批否:</label>
<div class="col-sm-8">
<select name="finanaceSupervisorApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批财务主管名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="finanaceSupervisorApproval" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">财务主管审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="finanaceSupervisorApprovalTime" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">副总经理审批否:</label>
<div class="col-sm-8">
<select name="deputyGeneralManagerApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批副总经理名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deputyGeneralManagerApproval" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">副总经理审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deputyGeneralManagerApprovalTime" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">总经理审批否:</label>
<div class="col-sm-8">
<select name="generalManagerApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批总经理名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="generalManagerApproval" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">总经理审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="generalManagerApprovalTime" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">出纳付完否:</label>
<div class="col-sm-8">
<select name="paidAccountingCashierFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">已付款会计出纳:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paidAccountingCashier" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">付款完时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paymentCompletionTime" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">实付金额:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paidInAmount" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">扣款金额:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deductionAmount" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">结案否:</label>
<div class="col-sm-8">
<select name="closeCaseFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: bootstrap-table-editable-js"/>
<script th:inline="javascript">
var prefix = ctx + "taxInvoice/financeRequestFunds"
$("#form-financeRequestFunds-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-financeRequestFunds-add').serialize());
}
}
$("input[name='requestFundsTime']").datetimepicker({
format: "yyyy-mm-dd HH:mm:ss",
minView: "month",
autoclose: true,
todayBtn: true
});
$("input[name='agreedPaymentDeadline']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true
});
$("input[name='periodOfPayment']").datetimepicker({
format: "yyyymm",
minView: "year",
autoclose: true,
todayBtn: true
});
$("input[name='requestFundsTime']").datetimepicker('setDate', new Date())
let userName = [[${@permission.getPrincipalProperty('userName')}]];
$("input[name='requestPerson']").val(userName);
//获取单号
$.ajax({
url: prefix + "/getId",
type: "post",
dateType: "json",
success: function (resp) {
console.log(resp)
if (resp!== null || resp!=="") {
$("input[name='requestFundsNumber']").val(resp);
} else {
$.modal.msgError("失败啦");
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
});
var changeSupplierId = 0
// 供应商信息
$.ajax({
url: ctx + "system/supplier/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
supplierdata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in supplierdata) {
$("select[name='supplierCode']").append("<option value='" + supplierdata[i].supplierCode + "'>" + supplierdata[i].supplierCode + "</option>");
// $("select[name='supplierName']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
}
$("select[name='supplierCode']").change(function () {
var supplierCode = $(this).val();
for (i = 0; i < supplierdata.length; i++) {
if (supplierdata[i].supplierCode == supplierCode) {
changeSupplierId++;
if (changeSupplierId < 2) {
$("input[name='supplierName']").val(supplierdata[i].supplierName)
$("input[name='depositBank']").val(supplierdata[i].depositBank)
$("input[name='bankAccount']").val(supplierdata[i].bankAccount)
$("input[name='paymentTerms']").val(supplierdata[i].paymentTerms)
}
}
// changeSupplierId = 0
}
})
// $("select[name='supplierName']").change(function () {
// var supplierName = $(this).val();
// for (i = 0; i < supplierdata.length; i++) {
// if (supplierdata[i].supplierName == supplierName) {
// changeSupplierId++;
// if (changeSupplierId < 2) {
// $("select[name='supplierCode']").val(supplierdata[i].supplierCode).trigger("blur")
// $("input[name='depositBank']").val(supplierdata[i].depositBank)
// $("input[name='bankAccount']").val(supplierdata[i].bankAccount)
// $("input[name='paymentTerms']").val(supplierdata[i].paymentTerms)
// }
// }
// changeSupplierId = 0
// }
// })
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
});
//获取部门信息
$.ajax({
url: ctx + "system/dept/list",
type: "post",
success: function (res) {
console.log(res)
if (res.length > 0) {
let deptData = res;
for (let i in deptData) {
// console.log(finishProductData[i].finishProductCode)
$("select[name='requestFundsDept']").append("<option value='" + deptData[i].deptName + "'>" + deptData[i].deptName + "</option>");
}
$("select[name='requestFundsDept']").val("营运管理部门").trigger("change")
}
}
})
</script>
</body>
</html>

396
ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/edit.html

@ -0,0 +1,396 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改付款申请单')" />
<th:block th:include="include :: datetimepicker-css" />
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
<th:block th:include="include :: bootstrap-editable-css"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-financeRequestFunds-edit" th:object="${financeRequestFunds}">
<input name="requestFundsId" th:field="*{requestFundsId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">申请单号:</label>
<div class="col-sm-8">
<input name="requestFundsNumber" th:field="*{requestFundsNumber}" class="form-control" type="text" required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请日期时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="requestFundsTime" th:field="*{requestFundsTime}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">币别:</label>
<div class="col-sm-8">
<select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{commonCurrency}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">申请人:</label>
<div class="col-sm-8">
<input name="requestPerson" th:field="*{requestPerson}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">约定付款期限:</label>
<div class="col-sm-8">
<!-- <input name="agreedPaymentDeadline" th:field="*{agreedPaymentDeadline}" class="form-control" type="text">-->
<div class="input-group date">
<input name="agreedPaymentDeadline" th:field="*{agreedPaymentDeadline}" class="form-control" placeholder="yyyy-mm-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">厂商代码:</label>
<div class="col-sm-8">
<!-- <input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text">-->
<select name="supplierCode" class="form-control m-b" >
<option value="">请选择厂商代码</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">厂商名称:</label>
<div class="col-sm-8">
<input name="supplierName" th:field="*{supplierName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开户银行:</label>
<div class="col-sm-8">
<input name="depositBank" th:field="*{depositBank}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">银行账号:</label>
<div class="col-sm-8">
<input name="bankAccount" th:field="*{bankAccount}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">款项所属期:</label>
<div class="col-sm-8">
<!-- <select name="periodOfPayment" class="form-control m-b">-->
<!-- <option value="">所有</option>-->
<!-- </select>-->
<div class="input-group date">
<input name="periodOfPayment" th:field="*{periodOfPayment}" class="form-control" placeholder="yyyymm" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款源由类别:</label>
<div class="col-sm-8">
<select name="requestReasonCategory" class="form-control m-b" th:with="type=${@dict.getType('request_reason_category')}">
<option value="">请选择请款源由类别</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{requestReasonCategory}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款部门:</label>
<div class="col-sm-8">
<!-- <input name="requestFundsDept" th:field="*{requestFundsDept}" class="form-control" type="text">-->
<select name="requestFundsDept" class="form-control m-b" >
<option value="">请选择请款部门</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">发票类别:</label>
<div class="col-sm-8">
<select name="invoiceCategory" class="form-control m-b" th:with="type=${@dict.getType('invoice_category')}">
<option value="">请选择发票类别</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{invoiceCategory}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款条件:</label>
<div class="col-sm-8">
<input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款方式:</label>
<div class="col-sm-8">
<!-- <input name="paymentWay" th:field="*{paymentWay}" class="form-control" type="text">-->
<select name="paymentWay" class="form-control m-b" th:with="type=${@dict.getType('payment_way')}">
<option value="">请选择付款方式</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{paymentWay}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">请款金额合计:</label>
<div class="col-sm-8">
<input name="requestAmountTotal" th:field="*{requestAmountTotal}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">本月请款合计:</label>
<div class="col-sm-8">
<input name="monthRequestTotal" th:field="*{monthRequestTotal}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">金额(大写):</label>
<div class="col-sm-8">
<input name="amountUppercase" th:field="*{amountUppercase}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款事项:</label>
<div class="col-sm-8">
<textarea name="paymentMatters" class="form-control">[[*{paymentMatters}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<textarea name="remarks" class="form-control">[[*{remarks}]]</textarea>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">主管审批否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="supervisorApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{supervisorApprovalFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批主管名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="supervisorApproval" th:field="*{supervisorApproval}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">主管审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="supervisorApprovalTime" th:field="*{supervisorApprovalTime}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">财务主管审批否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="finanaceSupervisorApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{finanaceSupervisorApprovalFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批财务主管名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="finanaceSupervisorApproval" th:field="*{finanaceSupervisorApproval}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">财务主管审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="finanaceSupervisorApprovalTime" th:field="*{finanaceSupervisorApprovalTime}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">副总经理审批否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="deputyGeneralManagerApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{deputyGeneralManagerApprovalFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批副总经理名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deputyGeneralManagerApproval" th:field="*{deputyGeneralManagerApproval}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">副总经理审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deputyGeneralManagerApprovalTime" th:field="*{deputyGeneralManagerApprovalTime}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">总经理审批否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="generalManagerApprovalFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{generalManagerApprovalFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">审批总经理名:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="generalManagerApproval" th:field="*{generalManagerApproval}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">总经理审批时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="generalManagerApprovalTime" th:field="*{generalManagerApprovalTime}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">出纳付完否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="paidAccountingCashierFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{paidAccountingCashierFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">已付款会计出纳:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paidAccountingCashier" th:field="*{paidAccountingCashier}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">付款完时间:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paymentCompletionTime" th:field="*{paymentCompletionTime}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">实付金额:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="paidInAmount" th:field="*{paidInAmount}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">扣款金额:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="deductionAmount" th:field="*{deductionAmount}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">结案否:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="closeCaseFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{closeCaseFlag}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js"/>
<th:block th:include="include :: bootstrap-table-editable-js"/>
<script th:inline="javascript">
var prefix = ctx + "taxInvoice/financeRequestFunds";
var getData = [[${financeRequestFunds}]]
$("#form-financeRequestFunds-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-financeRequestFunds-edit').serialize());
}
}
$("input[name='requestFundsTime']").datetimepicker({
format: "yyyy-mm-dd HH:mm:ss",
minView: "month",
autoclose: true,
todayBtn: true
});
$("input[name='agreedPaymentDeadline']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true
});
$("input[name='periodOfPayment']").datetimepicker({
format: "yyyymm",
minView: "year",
autoclose: true,
todayBtn: true
});
// 供应商信息
$.ajax({
url: ctx + "system/supplier/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
supplierdata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in supplierdata) {
$("select[name='supplierCode']").append("<option value='" + supplierdata[i].supplierCode + "'>" + supplierdata[i].supplierCode + "</option>");
// $("select[name='supplierName']").append("<option value='" + supplierdata[i].supplierName + "'>" + supplierdata[i].supplierName + "</option>");
}
$("select[name='supplierCode']").val(getData.supplierCode).trigger("change")
$("select[name='supplierCode']").change(function () {
var supplierCode = $(this).val();
for (i = 0; i < supplierdata.length; i++) {
if (supplierdata[i].supplierCode == supplierCode) {
$("input[name='supplierName']").val(supplierdata[i].supplierName)
$("input[name='depositBank']").val(supplierdata[i].depositBank)
$("input[name='bankAccount']").val(supplierdata[i].bankAccount)
$("input[name='paymentTerms']").val(supplierdata[i].paymentTerms)
}
// changeSupplierId = 0
}
})
// $("select[name='supplierName']").change(function () {
// var supplierName = $(this).val();
// for (i = 0; i < supplierdata.length; i++) {
// if (supplierdata[i].supplierName == supplierName) {
// changeSupplierId++;
// if (changeSupplierId < 2) {
// $("select[name='supplierCode']").val(supplierdata[i].supplierCode).trigger("blur")
// $("input[name='depositBank']").val(supplierdata[i].depositBank)
// $("input[name='bankAccount']").val(supplierdata[i].bankAccount)
// $("input[name='paymentTerms']").val(supplierdata[i].paymentTerms)
// }
// }
// changeSupplierId = 0
// }
// })
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
});
//获取部门信息
$.ajax({
url: ctx + "system/dept/list",
type: "post",
success: function (res) {
console.log(res)
if (res.length > 0) {
let deptData = res;
for (let i in deptData) {
// console.log(finishProductData[i].finishProductCode)
$("select[name='requestFundsDept']").append("<option value='" + deptData[i].deptName + "'>" + deptData[i].deptName + "</option>");
}
$("select[name='requestFundsDept']").val(getData.requestFundsDept).trigger("change")
// $("select[name='requestFundsDept']").val("营运管理部门").trigger("change")
}
}
})
</script>
</body>
</html>

406
ruoyi-admin/src/main/resources/templates/taxInvoice/financeRequestFunds/financeRequestFunds.html

@ -0,0 +1,406 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('付款申请单列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>申请单号:</label>
<input type="text" name="requestFundsNumber"/>
</li>
<li class="select-time">
<label>申请日期时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRequestFundsTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRequestFundsTime]"/>
</li>
<li>
<label>币别:</label>
<select name="commonCurrency" th:with="type=${@dict.getType('sys_common_currency')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>申请人:</label>
<input type="text" name="requestPerson"/>
</li>
<li>
<label>厂商代码:</label>
<input type="text" name="supplierCode"/>
</li>
<li>
<label>厂商名称:</label>
<input type="text" name="supplierName"/>
</li>
<li>
<label>款项所属期:</label>
<select name="periodOfPayment">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>请款源由类别:</label>
<select name="requestReasonCategory" th:with="type=${@dict.getType('request_reason_category')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>发票类别:</label>
<select name="invoiceCategory" th:with="type=${@dict.getType('invoice_category')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>主管审批否:</label>
<select name="supervisorApprovalFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>审批主管名:</label>
<input type="text" name="supervisorApproval"/>
</li>
<li>
<label>财务主管审批否:</label>
<select name="finanaceSupervisorApprovalFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>审批财务主管名:</label>
<input type="text" name="finanaceSupervisorApproval"/>
</li>
<li>
<label>副总经理审批否:</label>
<select name="deputyGeneralManagerApprovalFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>审批副总经理名:</label>
<input type="text" name="deputyGeneralManagerApproval"/>
</li>
<li>
<label>总经理审批否:</label>
<select name="generalManagerApprovalFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>审批总经理名:</label>
<input type="text" name="generalManagerApproval"/>
</li>
<li>
<label>出纳付完否:</label>
<select name="paidAccountingCashierFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>已付款会计出纳:</label>
<input type="text" name="paidAccountingCashier"/>
</li>
<li>
<label>结案否:</label>
<select name="closeCaseFlag" th:with="type=${@dict.getType('sys_whether')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="taxInvoice:financeRequestFunds:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="taxInvoice:financeRequestFunds:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="taxInvoice:financeRequestFunds:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="taxInvoice:financeRequestFunds:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" style="white-space: nowrap"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('taxInvoice:financeRequestFunds:edit')}]];
var removeFlag = [[${@permission.hasPermi('taxInvoice:financeRequestFunds:remove')}]];
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
var requestReasonCategoryDatas = [[${@dict.getType('request_reason_category')}]];
var invoiceCategoryDatas = [[${@dict.getType('invoice_category')}]];
var paymentWayDatas = [[${@dict.getType('payment_way')}]];
var supervisorApprovalFlagDatas = [[${@dict.getType('sys_whether')}]];
var finanaceSupervisorApprovalFlagDatas = [[${@dict.getType('sys_whether')}]];
var deputyGeneralManagerApprovalFlagDatas = [[${@dict.getType('sys_whether')}]];
var generalManagerApprovalFlagDatas = [[${@dict.getType('sys_whether')}]];
var paidAccountingCashierFlagDatas = [[${@dict.getType('sys_whether')}]];
var closeCaseFlagDatas = [[${@dict.getType('sys_whether')}]];
var prefix = ctx + "taxInvoice/financeRequestFunds";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "付款申请单",
clickToSelect: true,
columns: [{
checkbox: true
},
{
field: 'requestFundsId',
title: '请款id',
visible: false
},
{
field: 'requestFundsNumber',
title: '申请单号'
},
{
field: 'requestFundsTime',
title: '申请日期时间'
},
{
field: 'commonCurrency',
title: '币别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(commonCurrencyDatas, value);
}
},
{
field: 'requestPerson',
title: '申请人'
},
{
field: 'agreedPaymentDeadline',
title: '约定付款期限'
},
{
field: 'supplierCode',
title: '厂商代码'
},
{
field: 'supplierName',
title: '厂商名称'
},
{
field: 'depositBank',
title: '开户银行'
},
{
field: 'bankAccount',
title: '银行账号'
},
{
field: 'periodOfPayment',
title: '款项所属期'
},
{
field: 'requestReasonCategory',
title: '请款源由类别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(requestReasonCategoryDatas, value);
}
},
{
field: 'requestFundsDept',
title: '请款部门'
},
{
field: 'invoiceCategory',
title: '发票类别',
formatter: function(value, row, index) {
return $.table.selectDictLabel(invoiceCategoryDatas, value);
}
},
{
field: 'paymentTerms',
title: '付款条件'
},
{
field: 'paymentWay',
title: '付款方式',
formatter: function(value, row, index) {
return $.table.selectDictLabel(paymentWayDatas, value);
}
},
{
field: 'requestAmountTotal',
title: '请款金额合计'
},
{
field: 'monthRequestTotal',
title: '本月请款合计'
},
{
field: 'amountUppercase',
title: '金额'
},
{
field: 'paymentMatters',
title: '付款事项'
},
{
field: 'remarks',
title: '备注'
},
{
field: 'supervisorApprovalFlag',
title: '主管审批否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(supervisorApprovalFlagDatas, value);
}
},
{
field: 'supervisorApproval',
title: '审批主管名'
},
{
field: 'supervisorApprovalTime',
title: '主管审批时间'
},
{
field: 'finanaceSupervisorApprovalFlag',
title: '财务主管审批否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(finanaceSupervisorApprovalFlagDatas, value);
}
},
{
field: 'finanaceSupervisorApproval',
title: '审批财务主管名'
},
{
field: 'finanaceSupervisorApprovalTime',
title: '财务主管审批时间'
},
{
field: 'deputyGeneralManagerApprovalFlag',
title: '副总经理审批否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(deputyGeneralManagerApprovalFlagDatas, value);
}
},
{
field: 'deputyGeneralManagerApproval',
title: '审批副总经理名'
},
{
field: 'deputyGeneralManagerApprovalTime',
title: '副总经理审批时间'
},
{
field: 'generalManagerApprovalFlag',
title: '总经理审批否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(generalManagerApprovalFlagDatas, value);
}
},
{
field: 'generalManagerApproval',
title: '审批总经理名'
},
{
field: 'generalManagerApprovalTime',
title: '总经理审批时间'
},
{
field: 'paidAccountingCashierFlag',
title: '出纳付完否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(paidAccountingCashierFlagDatas, value);
}
},
{
field: 'paidAccountingCashier',
title: '已付款会计出纳'
},
{
field: 'paymentCompletionTime',
title: '付款完时间'
},
{
field: 'paidInAmount',
title: '实付金额'
},
{
field: 'deductionAmount',
title: '扣款金额'
},
{
field: 'closeCaseFlag',
title: '结案否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(closeCaseFlagDatas, value);
}
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
}]
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requestFundsId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.requestFundsId + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
};
$.table.init(options);
});
</script>
</body>
</html>

BIN
ruoyi-framework/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class

Binary file not shown.

BIN
ruoyi-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class

Binary file not shown.

12
smart-erp.iml

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Loading…
Cancel
Save