root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

删除旧版无用的销售对账对象 sales_account_reconciliation和系统中对应的前端所有代码和后端所有代码 和对应的系统菜单数据

dev
liuxiaoxu 1 month ago
parent
d7ed65a87a
commit
2a0cfb018e
9 changed files with 0 additions and 2828 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 245
      ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java
  2. 807
      ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java
  3. 61
      ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java
  4. 61
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java
  5. 105
      ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java
  6. 344
      ruoyi-admin/src/main/resources/mapper/sales/SalesOrderDetailMapper.xml
  7. 369
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html
  8. 370
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html
  9. 466
      ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html

245
ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesOrderDetailController.java
View File

@ -1,245 +0,0 @@
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.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
*
* @author ruoyi
* @date 2023-07-05
*/
@Controller
@RequestMapping("/sales/salesOrderDetail")
public class SalesOrderDetailController extends BaseController
{
private String prefix = "sales/salesOrderDetail";
@Autowired
private ISalesOrderDetailService salesOrderDetailService;
@Autowired
private IDeliveryGoodsDetailService deliveryGoodsDetailService;
@Autowired
private IWorkOrderInfoService workOrderInfoService;
@Autowired
private ISysDictTypeService sysDictTypeService;
@RequiresPermissions("sales:salesOrderDetail:view")
@GetMapping()
public String salesOrderDetail()
{
return prefix + "/salesOrderDetail";
}
/**
* 查询销售订单查询列表
*/
@RequiresPermissions("sales:salesOrderDetail:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(SalesOrderDetail salesOrderDetail)
{
startPage();
List<SalesOrderDetail> list = salesOrderDetailService.selectSalesOrderDetailList(salesOrderDetail);
return getDataTable(list);
}
/**
* 导出销售订单查询列表
*/
@RequiresPermissions("sales:salesOrderDetail: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, "销售订单查询数据");
}
/**
* 新增销售订单查询
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存销售订单查询
*/
@RequiresPermissions("sales:salesOrderDetail:add")
@Log(title = "销售订单查询", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(SalesOrderDetail salesOrderDetail)
{
return toAjax(salesOrderDetailService.insertSalesOrderDetail(salesOrderDetail));
}
/**
* 修改销售订单查询
*/
@GetMapping("/edit/{salesFinishId}")
public String edit(@PathVariable("salesFinishId") Long salesFinishId, ModelMap mmap)
{
SalesOrderDetail salesOrderDetail = salesOrderDetailService.selectSalesOrderDetailById(salesFinishId);
mmap.put("salesOrderDetail", salesOrderDetail);
return prefix + "/edit";
}
/**
* 修改保存销售订单查询
*/
@RequiresPermissions("sales:salesOrderDetail:edit")
@Log(title = "销售订单查询", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(SalesOrderDetail salesOrderDetail)
{
return toAjax(salesOrderDetailService.updateSalesOrderDetail(salesOrderDetail));
}
/**
* 删除销售订单查询
*/
@RequiresPermissions("sales:salesOrderDetail:remove")
@Log(title = "销售订单查询", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(salesOrderDetailService.deleteSalesOrderDetailByIds(ids));
}
/**
* 导出销售订单查询列表
*/
@RequiresPermissions("sales:salesOrderDetail:export")
@Log(title = "销售订单查询", businessType = BusinessType.EXPORT)
@PostMapping("/exportDatas/{ids}")
@ResponseBody
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);
}
}
}

807
ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesOrderDetail.java
View File

@ -1,807 +0,0 @@
package com.ruoyi.sales.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;
/**
* 销售订单查询对象 sales_order_detail
*
* @author ruoyi
* @date 2023-07-05
*/
public class SalesOrderDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 订单id */
private Long salesFinishId;
/** 订单编号 */
@Excel(name = "订单编号")
private String salesOrderCode;
/** 订单号码 */
@Excel(name = "订单号码")
private String salesOrderNumber;
/** 客户代码 */
@Excel(name = "客户代码")
private String enterpriseCode;
/** 客户名称 */
@Excel(name = "客户名称")
private String enterpriseName;
/** 付款条件 */
@Excel(name = "付款条件")
private String paymentTerms;
/** 交货条件 */
@Excel(name = "交货条件")
private String deliveryConditions;
/** 交货方式 */
@Excel(name = "交货方式")
private String deliveryMethod;
/** 接单方式 */
@Excel(name = "接单方式")
private String orderReceivingMode;
/** 联系人 */
@Excel(name = "联系人")
private String customerContact;
/** 客户厂区 */
@Excel(name = "客户厂区")
private String customerFactory;
/** 联系电话 */
@Excel(name = "联系电话")
private String contactNumber;
/** 业务人员 */
@Excel(name = "业务人员")
private String businessMembers;
/** 传真号码 */
@Excel(name = "传真号码")
private String customerFax;
/** 交货地点 */
@Excel(name = "交货地点")
private String deliveryAddress;
/** 接单日期 */
@Excel(name = "接单日期")
private String orderReceivingTime;
/** 开单日期时间 */
@Excel(name = "开单日期时间")
private String billingTime;
/** 备注内容 */
@Excel(name = "备注内容")
private String customerRemarks;
/** 当前库存数 */
@Excel(name = "当前库存数")
private String currentInventory;
/** 信用额度 */
@Excel(name = "信用额度")
private String creditLimit;
/** 未付款数 */
@Excel(name = "未付款数")
private String unpaidAmount;
/** 可用额度 */
@Excel(name = "可用额度")
private String availableCredit;
/** 是否含税 */
@Excel(name = "是否含税")
private String confirmTax;
/** 税率 */
@Excel(name = "税率")
private String taxRate;
/** 合计金额 */
@Excel(name = "合计金额")
private String totalAmount;
/** 修改日期 */
@Excel(name = "修改日期")
private String modificationTime;
/** 确认日期 */
@Excel(name = "确认日期")
private String confirmTime;
/** 文件存储 */
@Excel(name = "文件存储")
private String fileUpload;
/** 确认否 */
@Excel(name = "确认否")
private String confirmNo;
/** 确认人 */
@Excel(name = "确认人")
private String confirmName;
/** 结案否 */
@Excel(name = "结案否")
private String auditNo;
/** 结案人 */
@Excel(name = "结案人")
private String auditName;
/** 结案时间 */
@Excel(name = "结案时间")
private String auditTime;
/** 结案备注 */
@Excel(name = "结案备注")
private String auditRemarks;
/** 是否开国税发票 */
@Excel(name = "是否开国税发票")
private String nationalTaxBill;
/** 成品代码 */
@Excel(name = "成品代码")
private String finishProductCode;
/** 成品名称 */
@Excel(name = "成品名称")
private String finishProductName;
/** 规格型号 */
@Excel(name = "规格型号")
private String specificationModel;
/** 客户料号 */
@Excel(name = "客户料号")
private String customerNumber;
/** 机种 */
@Excel(name = "机种")
private String typeMachine;
/** 单位 */
@Excel(name = "单位")
private String inventoryUnit;
/** 重量 */
@Excel(name = "重量")
private String stockUnitWeight;
/** 币别 */
@Excel(name = "币别")
private String commonCurrency;
/** 单价 */
@Excel(name = "单价")
private String processPrice;
/** 数量 */
@Excel(name = "数量")
private String productQuantity;
/** 金额 */
@Excel(name = "金额")
private String amountMoney;
/** 交期 */
@Excel(name = "交期")
private String deliveryTime;
/** Line# */
@Excel(name = "Line#")
private String line;
/** 版本号 */
@Excel(name = "版本号")
private String versionNumber;
/** 说明 */
@Excel(name = "说明")
private String salesExplain;
/** 客户使用否 */
@Excel(name = "客户使用否")
private String customerUseOrNot;
/** 客户使用数量 */
@Excel(name = "客户使用数量")
private String customerUseQuantity;
/** 客户使用备注说明 */
@Excel(name = "客户使用备注说明")
private String customerUseRemarks;
/** 对账否 */
@Excel(name = "对账否")
private String accountReconciliationOrNot;
/** 对账人 */
@Excel(name = "对账人")
private String accountReconciliationPerson;
/** 对账时间 */
@Excel(name = "对账时间")
private String accountReconciliationTime;
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;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("salesFinishId", getSalesFinishId())
.append("salesOrderCode", getSalesOrderCode())
.append("salesOrderNumber", getSalesOrderNumber())
.append("enterpriseCode", getEnterpriseCode())
.append("enterpriseName", getEnterpriseName())
.append("paymentTerms", getPaymentTerms())
.append("deliveryConditions", getDeliveryConditions())
.append("deliveryMethod", getDeliveryMethod())
.append("orderReceivingMode", getOrderReceivingMode())
.append("customerContact", getCustomerContact())
.append("customerFactory", getCustomerFactory())
.append("contactNumber", getContactNumber())
.append("businessMembers", getBusinessMembers())
.append("customerFax", getCustomerFax())
.append("deliveryAddress", getDeliveryAddress())
.append("orderReceivingTime", getOrderReceivingTime())
.append("billingTime", getBillingTime())
.append("customerRemarks", getCustomerRemarks())
.append("currentInventory", getCurrentInventory())
.append("creditLimit", getCreditLimit())
.append("unpaidAmount", getUnpaidAmount())
.append("availableCredit", getAvailableCredit())
.append("confirmTax", getConfirmTax())
.append("taxRate", getTaxRate())
.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("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())
.append("deliveryTime", getDeliveryTime())
.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();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesOrderDetailMapper.java
View File

@ -1,61 +0,0 @@
package com.ruoyi.sales.mapper;
import java.util.List;
import com.ruoyi.sales.domain.SalesOrderDetail;
/**
* 销售订单查询Mapper接口
*
* @author ruoyi
* @date 2023-07-05
*/
public interface SalesOrderDetailMapper
{
/**
* 查询销售订单查询
*
* @param salesFinishId 销售订单查询ID
* @return 销售订单查询
*/
public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId);
/**
* 查询销售订单查询列表
*
* @param salesOrderDetail 销售订单查询
* @return 销售订单查询集合
*/
public List<SalesOrderDetail> selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail);
/**
* 新增销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail);
/**
* 修改销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
public int updateSalesOrderDetail(SalesOrderDetail salesOrderDetail);
/**
* 删除销售订单查询
*
* @param salesFinishId 销售订单查询ID
* @return 结果
*/
public int deleteSalesOrderDetailById(Long salesFinishId);
/**
* 批量删除销售订单查询
*
* @param salesFinishIds 需要删除的数据ID
* @return 结果
*/
public int deleteSalesOrderDetailByIds(String[] salesFinishIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesOrderDetailService.java
View File

@ -1,61 +0,0 @@
package com.ruoyi.sales.service;
import java.util.List;
import com.ruoyi.sales.domain.SalesOrderDetail;
/**
* 销售订单查询Service接口
*
* @author ruoyi
* @date 2023-07-05
*/
public interface ISalesOrderDetailService
{
/**
* 查询销售订单查询
*
* @param salesFinishId 销售订单查询ID
* @return 销售订单查询
*/
public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId);
/**
* 查询销售订单查询列表
*
* @param salesOrderDetail 销售订单查询
* @return 销售订单查询集合
*/
public List<SalesOrderDetail> selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail);
/**
* 新增销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail);
/**
* 修改销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
public int updateSalesOrderDetail(SalesOrderDetail salesOrderDetail);
/**
* 批量删除销售订单查询
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteSalesOrderDetailByIds(String ids);
/**
* 删除销售订单查询信息
*
* @param salesFinishId 销售订单查询ID
* @return 结果
*/
public int deleteSalesOrderDetailById(Long salesFinishId);
}

105
ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesOrderDetailServiceImpl.java
View File

@ -1,105 +0,0 @@
package com.ruoyi.sales.service.impl;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.sales.domain.SalesOrderDetail;
import com.ruoyi.sales.mapper.SalesOrderDetailMapper;
import com.ruoyi.sales.service.ISalesOrderDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 销售订单查询Service业务层处理
*
* @author ruoyi
* @date 2023-07-05
*/
@Service
public class SalesOrderDetailServiceImpl implements ISalesOrderDetailService
{
@Autowired
private SalesOrderDetailMapper salesOrderDetailMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询销售订单查询
*
* @param salesFinishId 销售订单查询ID
* @return 销售订单查询
*/
@Override
public SalesOrderDetail selectSalesOrderDetailById(Long salesFinishId)
{
return salesOrderDetailMapper.selectSalesOrderDetailById(salesFinishId);
}
/**
* 查询销售订单查询列表
*
* @param salesOrderDetail 销售订单查询
* @return 销售订单查询
*/
@Override
public List<SalesOrderDetail> selectSalesOrderDetailList(SalesOrderDetail salesOrderDetail)
{
return salesOrderDetailMapper.selectSalesOrderDetailList(salesOrderDetail);
}
/**
* 新增销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
@Override
public int insertSalesOrderDetail(SalesOrderDetail salesOrderDetail)
{
String loginName = ShiroUtils.getLoginName();
salesOrderDetail.setUpdateBy(loginName);
salesOrderDetail.setUpdateTime(DateUtils.getNowDate());
String saleNo = redisCache.generateBillNo("XS");
salesOrderDetail.setSalesOrderCode(saleNo);
return salesOrderDetailMapper.insertSalesOrderDetail(salesOrderDetail);
}
/**
* 修改销售订单查询
*
* @param salesOrderDetail 销售订单查询
* @return 结果
*/
@Override
public int updateSalesOrderDetail(SalesOrderDetail salesOrderDetail)
{
return salesOrderDetailMapper.updateSalesOrderDetail(salesOrderDetail);
}
/**
* 删除销售订单查询对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteSalesOrderDetailByIds(String ids)
{
return salesOrderDetailMapper.deleteSalesOrderDetailByIds(Convert.toStrArray(ids));
}
/**
* 删除销售订单查询信息
*
* @param salesFinishId 销售订单查询ID
* @return 结果
*/
@Override
public int deleteSalesOrderDetailById(Long salesFinishId)
{
return salesOrderDetailMapper.deleteSalesOrderDetailById(salesFinishId);
}
}

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

@ -1,344 +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="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>

369
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/add.html
View File

@ -1,369 +0,0 @@
<!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" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<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">
<input name="salesOrderCode" 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="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="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">
<input name="enterpriseName" 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="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="deliveryConditions" 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="deliveryMethod" 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="orderReceivingMode" 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="customerContact" 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="customerFactory" 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="contactNumber" 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="businessMembers" 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="customerFax" 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="deliveryAddress" class="form-control" type="text">
</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="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">
<label class="col-sm-3 control-label">开单日期时间：</label>
<div class="col-sm-8">
<input name="billingTime" 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="customerRemarks" 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="currentInventory" 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="creditLimit" 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="unpaidAmount" 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="availableCredit" 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="confirmTax" 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="taxRate" 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="totalAmount" 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="modificationTime" 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="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">
<input name="confirmNo" 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="confirmName" 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="auditNo" 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="auditName" 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="auditTime" 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="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">
<input name="nationalTaxBill" 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="finishProductCode" 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="finishProductName" 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="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">
<input name="typeMachine" 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="inventoryUnit" 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="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">
<label class="col-sm-3 control-label">单价：</label>
<div class="col-sm-8">
<input name="processPrice" 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="productQuantity" 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="amountMoney" 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="deliveryTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Line#：</label>
<div class="col-sm-8">
<input name="line" 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="versionNumber" 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="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 + "sales/salesOrderDetail"
$("#form-salesOrderDetail-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-salesOrderDetail-add').serialize());
}
}
$("input[name='orderReceivingTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

370
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/edit.html
View File

@ -1,370 +0,0 @@
<!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" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<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">
<input name="salesOrderCode" th:field="*{salesOrderCode}" 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="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="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">
<input name="enterpriseName" th:field="*{enterpriseName}" 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="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="deliveryConditions" th:field="*{deliveryConditions}" 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="deliveryMethod" th:field="*{deliveryMethod}" 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="orderReceivingMode" th:field="*{orderReceivingMode}" 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="customerContact" th:field="*{customerContact}" 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="customerFactory" th:field="*{customerFactory}" 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="contactNumber" th:field="*{contactNumber}" 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="businessMembers" th:field="*{businessMembers}" 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="customerFax" th:field="*{customerFax}" 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="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
</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="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">
<label class="col-sm-3 control-label">开单日期时间：</label>
<div class="col-sm-8">
<input name="billingTime" th:field="*{billingTime}" 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="customerRemarks" th:field="*{customerRemarks}" 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="currentInventory" th:field="*{currentInventory}" 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="creditLimit" th:field="*{creditLimit}" 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="unpaidAmount" th:field="*{unpaidAmount}" 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="availableCredit" th:field="*{availableCredit}" 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="confirmTax" th:field="*{confirmTax}" 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="taxRate" th:field="*{taxRate}" 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="totalAmount" th:field="*{totalAmount}" 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="modificationTime" th:field="*{modificationTime}" 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="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">
<input name="confirmNo" th:field="*{confirmNo}" 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="confirmName" th:field="*{confirmName}" 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="auditNo" th:field="*{auditNo}" 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="auditName" th:field="*{auditName}" 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="auditTime" th:field="*{auditTime}" 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="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">
<input name="nationalTaxBill" th:field="*{nationalTaxBill}" 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="finishProductCode" th:field="*{finishProductCode}" 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="finishProductName" th:field="*{finishProductName}" 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="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">
<input name="typeMachine" th:field="*{typeMachine}" 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="inventoryUnit" th:field="*{inventoryUnit}" 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="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">
<label class="col-sm-3 control-label">单价：</label>
<div class="col-sm-8">
<input name="processPrice" th:field="*{processPrice}" 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="productQuantity" th:field="*{productQuantity}" 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="amountMoney" th:field="*{amountMoney}" 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="deliveryTime" th:field="*{deliveryTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Line#：</label>
<div class="col-sm-8">
<input name="line" th:field="*{line}" 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="versionNumber" th:field="*{versionNumber}" 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="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 + "sales/salesOrderDetail";
$("#form-salesOrderDetail-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-salesOrderDetail-edit').serialize());
}
}
$("input[name='orderReceivingTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

466
ruoyi-admin/src/main/resources/templates/sales/salesOrderDetail/salesOrderDetail.html
View File

@ -1,466 +0,0 @@
<!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 :: datetimepicker-css"/>
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
</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 class="select-time">
<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[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>
<input type="text" name="enterpriseName"/>
</li>
<li>
<label>接单方式：</label>
<input type="text" name="orderReceivingMode"/>
</li>
<li>
<label>成品代码：</label>
<input type="text" name="finishProductCode"/>
</li>
<li>
<label>成品名称：</label>
<input type="text" name="finishProductName"/>
</li>
<li>
<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>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<!-- <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>-->
<!-- <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">
<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('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 = {
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);
},
visible: false
},
{
field: 'confirmName',
title: '确认人',
visible: false
},
{
field: 'auditNo',
title: '结案否',
formatter: function(value, row, index) {
return $.table.selectDictLabel(whetherDatas, value);
},
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);
},
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);
},
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);
});
// $.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>
Write Preview
Loading…
Cancel
Save