diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index f9d9437e..9f97f65d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -259,7 +259,7 @@ public class SysCustomerController extends BaseController //获取发票基础信息 - SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(selectDataList.get(0).getCustomerId()); + SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(selectDataList.get(0).getId()); SysCustomerDto sysCustomerDto = new SysCustomerDto(); BeanUtils.copyProperties(sysCustomer,sysCustomerDto); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteChildController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteChildController.java index ef4048d1..fbdd32ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteChildController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteChildController.java @@ -5,6 +5,7 @@ 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.exception.base.BaseException; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysCustomerQuoteChild; import com.ruoyi.system.service.ISysCustomerQuoteChildService; @@ -41,7 +42,6 @@ public class SysCustomerQuoteChildController extends BaseController /** * 查询客户报价子列表 */ - @RequiresPermissions("system:quoteChild:list") @PostMapping("/list") @ResponseBody public TableDataInfo list(SysCustomerQuoteChild sysCustomerQuoteChild) @@ -77,7 +77,6 @@ public class SysCustomerQuoteChildController extends BaseController /** * 新增保存客户报价子 */ - @RequiresPermissions("system:quoteChild:add") @Log(title = "客户报价子", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody @@ -89,7 +88,6 @@ public class SysCustomerQuoteChildController extends BaseController /** * 修改客户报价子 */ - @RequiresPermissions("system:quoteChild:edit") @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { @@ -101,7 +99,6 @@ public class SysCustomerQuoteChildController extends BaseController /** * 修改保存客户报价子 */ - @RequiresPermissions("system:quoteChild:edit") @Log(title = "客户报价子", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody @@ -113,7 +110,6 @@ public class SysCustomerQuoteChildController extends BaseController /** * 删除客户报价子 */ - @RequiresPermissions("system:quoteChild:remove") @Log(title = "客户报价子", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index b239130e..a47bbc33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -14,12 +14,22 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.erp.domain.ErpMaterialVo; +import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.system.domain.SysSalesFinish; import com.ruoyi.system.domain.SysSalesOrder; +import com.ruoyi.system.domain.SysSalesOrderVo; import com.ruoyi.system.domain.exportDto.SysSalesFinishDto; import com.ruoyi.system.domain.exportDto.SysSalesOrderDto; +import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysSalesFinishService; import com.ruoyi.system.service.ISysSalesOrderService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.apache.commons.lang3.BooleanUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,12 +41,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; 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 java.util.*; import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; @@ -57,6 +65,18 @@ public class SysSalesOrderController extends BaseController @Autowired private ISysSalesFinishService sysSalesFinishService; + @Autowired + private ISysRoleService roleService; + + @Autowired + private TaskService taskService; + + @Autowired + private RuntimeService runtimeService; + + @Autowired + private IProcessService processService; + @RequiresPermissions("system:salesOrder:view") @GetMapping() public String salesOrder() @@ -70,28 +90,28 @@ public class SysSalesOrderController extends BaseController @RequiresPermissions("system:salesOrder:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysSalesOrder sysSalesOrder) + public TableDataInfo list(SysSalesOrderVo sysSalesOrder) { startPage(); - List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrder); + List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrder); return getDataTable(list); } /** * 导出销售订单列表 */ -/* + @RequiresPermissions("system:salesOrder:export") @Log(title = "销售订单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(SysSalesOrder sysSalesOrder) + public AjaxResult export(SysSalesOrderVo sysSalesOrder) { - List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrder); - ExcelUtil util = new ExcelUtil(SysSalesOrder.class); + List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrder); + ExcelUtil util = new ExcelUtil(SysSalesOrderVo.class); return util.exportExcel(list, "销售订单数据"); } -*/ + /** * 新增销售订单 @@ -312,4 +332,95 @@ public class SysSalesOrderController extends BaseController return Result.getSuccessResult(sysSalesOrderService.getId()); } + + /** + * 加载审批弹窗 + * @param taskId + * @param mmap + * @return + */ + @GetMapping("/showVerifyDialog/{taskId}") + public String showVerifyDialog(@PathVariable("taskId") String taskId, ModelMap mmap) { + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String processInstanceId = task.getProcessInstanceId(); + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + SysSalesOrderVo sysSalesOrderVo = sysSalesOrderService.selectSysSalesOrderById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", sysSalesOrderVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + return prefix + "/task" + verifyName; + } + + /** + * 完成任务 + * + * @return + */ + @RequestMapping(value = "/complete/{taskId}", method = {RequestMethod.POST, RequestMethod.GET}) + @ResponseBody + public AjaxResult complete(@PathVariable("taskId") String taskId, @RequestParam(value = "saveEntity", required = false) String saveEntity, + @ModelAttribute("preloadObj") SysSalesOrderVo salesOrderVo, HttpServletRequest request) { + boolean saveEntityBoolean = BooleanUtils.toBoolean(saveEntity); + String instanceId = salesOrderVo.getInstanceId(); + String instanceType = salesOrderVo.getInstanceType(); + + boolean approvedFlag = processService.complete(taskId, instanceId, salesOrderVo.getApplyTitle(), salesOrderVo.getSalesOrderCode(), "salesOrder", new HashMap(), request); + if(!approvedFlag){ + // 审核状态-审核拒绝 + salesOrderVo.setAuditStatus("2"); + } + // 如果任务已结束更新业务表状态 + boolean processIsFinish = processService.judgeProcessIsFinish(instanceId); + if (processIsFinish) { + // 审核通过 + salesOrderVo.setAuditStatus("1"); + // 提交 + if("submit".equals(instanceType)){ + // 使用状态-是 + salesOrderVo.setUseStatus("1"); + } + // 作废 + else if("cancel".equals(instanceType)){ + // 使用状态-已作废 + salesOrderVo.setUseStatus("2"); + } + // 恢复 + else if("restore".equals(instanceType)){ + // 使用状态-是 + salesOrderVo.setUseStatus("1"); + } + } + sysSalesOrderService.updateSysSalesOrder(salesOrderVo); + // 驳回申请后继续申请，可能修改表单 + if (saveEntityBoolean) { + sysSalesOrderService.updateSysSalesOrder(salesOrderVo); + } + return success("任务已完成"); + } + + /** + * 自动绑定页面字段 + */ + @ModelAttribute("/preloadObj") + public SysSalesOrder getObj(@RequestParam(value = "id", required = false) Long id, HttpSession session) { + if (id != null) { + return sysSalesOrderService.selectSysSalesOrderById(id); + } + return new SysSalesOrder(); + } + + /** + * 作废客户销售订单信息信息 + */ + // @RequiresPermissions("erp:material:cancel") + @Log(title = "物料信息", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + SysSalesOrder sysSalesOrder = new SysSalesOrder(); + sysSalesOrder.setSalesOrderId(id); + sysSalesOrder.setUseStatus("2"); + sysSalesOrderService.updateSysSalesOrder(sysSalesOrder); + return AjaxResult.success(); + } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java index 4be8ff39..ebee599b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java @@ -1,10 +1,12 @@ package com.ruoyi.system.domain; +import com.fasterxml.jackson.annotation.JsonFormat; 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 java.util.Date; import java.util.List; /** @@ -32,6 +34,9 @@ public class SysCustomerQuote extends BaseEntity @Excel(name = "客户名称") private String customerName; + /*订价日期*/ + @Excel(name = "订价日期") + private String pricingDate; /** 物料合计 */ @Excel(name = "物料合计") private String enterprise; @@ -43,7 +48,8 @@ public class SysCustomerQuote extends BaseEntity /** 报价币种 */ @Excel(name = "报价币种") private String commonCurrency; - + /*是否含税*/ + private String confirmFax; /** 国内汇率 */ @Excel(name = "国内汇率") private Double rmbTax; @@ -76,16 +82,43 @@ public class SysCustomerQuote extends BaseEntity @Excel(name = "含税总价(美元)") private Double usdSum; private String businessMembers; - /** 审核标志: 0未审核 1审核成功 2审核拒绝 */ + @Excel(name = "审核标志: 0未审核 1审核成功 2审核拒绝") private String deginFlag; /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - + /** 审核标志: 0未审核 1审核成功 2审核拒绝 */ + private String auditStatus; + private String useStatus; /** 客户报价子信息 */ private List sysCustomerQuotechildList; + public String getConfirmFax() { + return confirmFax; + } + + public void setConfirmFax(String confirmFax) { + this.confirmFax = confirmFax; + } + + public String getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(String auditStatus) { + this.auditStatus = auditStatus; + } + + public String getUseStatus() { + return useStatus; + } + + public void setUseStatus(String useStatus) { + this.useStatus = useStatus; + } + + public void setId(Long id) { this.id = id; @@ -105,6 +138,7 @@ public class SysCustomerQuote extends BaseEntity } + public void setSysCustomerQuotechildList(List sysCustomerQuotechildList) { this.sysCustomerQuotechildList = sysCustomerQuotechildList; } @@ -136,7 +170,16 @@ public class SysCustomerQuote extends BaseEntity { return customerName; } - public void setEnterprise(String enterprise) + + public String getPricingDate() { + return pricingDate; + } + + public void setPricingDate(String pricingDate) { + this.pricingDate = pricingDate; + } + + public void setEnterprise(String enterprise) { this.enterprise = enterprise; } @@ -281,12 +324,20 @@ public class SysCustomerQuote extends BaseEntity .append("enterprise", getEnterprise()) .append("enterpriseSum", getEnterpriseSum()) .append("commonCurrency", getCommonCurrency()) + .append("pricingDate", getPricingDate()) + .append("confirmFax", getConfirmFax()) .append("rmbTax", getRmbTax()) .append("usdTax", getUsdTax()) .append("noRmbSum", getNoRmbSum()) .append("rmbSum", getRmbSum()) .append("noUsdSum", getNoUsdSum()) .append("usdSum", getUsdSum()) + .append("noRmb", getNoRmb()) + .append("rmb", getRmb()) + .append("noUsd", getNoUsd()) + .append("usd", getUsd()) + .append("auditStatus", getAuditStatus()) + .append("useStatus", getUseStatus()) .append("deginFlag", getDeginFlag()) .append("delFlag", getDelFlag()) .append("createBy", getCreateBy()) @@ -295,11 +346,6 @@ public class SysCustomerQuote extends BaseEntity .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("businessMembers",getBusinessMembers()) - .append("sysCustomerQuoteChildList",getSysCustomerQuotechildList()) .toString(); } - - public List getSysCustomerQuoteChildList() { - return sysCustomerQuotechildList; - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java index 724ef636..6c852cb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java @@ -22,7 +22,7 @@ public class SysCustomerQuoteChild extends BaseEntity /** 主表的中关联的id字段 */ @Excel(name = "主表的中关联的id字段") - private Long quoteId; + private String quoteId; /** 物料表中的id */ @Excel(name = "物料表中的id") @@ -122,12 +122,12 @@ public class SysCustomerQuoteChild extends BaseEntity { return id; } - public void setQuoteId(Long quoteId) + public void setQuoteId(String quoteId) { this.quoteId = quoteId; } - public Long getQuoteId() + public String getQuoteId() { return quoteId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index b7dc752d..e9f84d0c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import com.google.common.base.Objects; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,547 +12,443 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2022-12-15 */ -public class SysSalesOrder extends BaseEntity -{ +public class SysSalesOrder extends BaseEntity { private static final long serialVersionUID = 1L; - /** 订单id */ + /* 订单id*/ private Long salesOrderId; - - /** 订单编号 */ - @Excel(name = "订单编号") + /*使用状态*/ + private String useStatus; + /*审核状态*/ + private String auditStatus; + /*出货状态*/ + private String deliveryStatus; + /*收款结案状态*/ + private String closeStatus; + /*生产状态*/ + private String makeStatus; + /* 订单编号*/ + @Excel(name = "销售订单编号") private String salesOrderCode; - - /** 订单号码 */ - @Excel(name = "订单号码") + /*订单号码*/ + @Excel(name = "客户订单编号") private String salesOrderNumber; - - /** 预约单号 */ - @Excel(name = "预约单号") - private String appointmentNumber; - - /** 客户代码 */ + @Excel(name = "订单类型") + private String salesOrderType; + /* 客户代码*/ @Excel(name = "客户代码") private String enterpriseCode; - /** 客户名称 */ + /* 客户名称*/ @Excel(name = "客户名称") private String enterpriseName; - - /** 付款条件 */ - @Excel(name = "付款条件") - private String paymentTerms; - - /** 交货条件 */ + /*客户电话*/ + private String customerPhone; + /*物料合计*/ + private String materialSum; + /*数量合计*/ + private String enterpriseSum; + /*不含税单价(RMB)*/ + private Double noRmbPrice; + /*不含税总价(RMB)*/ + private Double noRmbSum; + /*含税单价(RMB)*/ + private Double rmbPrice; + /*含税总价(RMB)*/ + private Double rmbTaxSum; + /*不含税单价(美元)*/ + private Double noUsdPrice; + /*不含税总价(美元)*/ + private Double noUsdSum; + /*含税单价(美元)*/ + private Double usdPrice; + /*含税总价(美元)*/ + private String usdTaxSum; + /*计划交付时间*/ + private String deliveryTime; + /* 交货条件*/ @Excel(name = "交货条件") private String deliveryConditions; - - /** 交货方式 */ + /* 交货方式*/ @Excel(name = "交货方式") private String deliveryMethod; - - /** 接单方式 */ + /*交货地点*/ + @Excel(name = "交货地点") + private String deliveryAddress; + /*付款条件*/ + @Excel(name = "付款条件") + private String paymentTerms; + /*接单方式*/ @Excel(name = "接单方式") private String orderReceivingMode; - - /** 联系人 */ + /* 接单日期*/ + @Excel(name = "接单日期") + private String orderReceivingTime; + /*联系人*/ @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 businessMembers; + /*是否含税*/ @Excel(name = "是否含税") private String confirmTax; - /** 税率 */ + /* 修改日期*/ + @Excel(name = "客户验收时间") + private String modificationTime; + /* 税率*/ @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 = "实收金额(RMB)") + private String standbyOne; + /*备用二*/ + @Excel(name = "实收金额(美元)") + private String standbyTwo; + /* 录入时间*/ + @Excel(name = "录入时间") + private String firstAddTime; + /* 修改时间*/ + @Excel(name = "修改时间") + private String updateInfoTime; + /*贸易条款**/ + @Excel(name = "贸易条款") + private String tradeClause; - /** 确认否 */ - @Excel(name = "确认否") - private String confirmNo; - - /** 确认人 */ - @Excel(name = "确认人") - private String confirmName; - - /** 审核否 */ - @Excel(name = "审核否") - private String auditNo; - - /** 备用一 */ - @Excel(name = "备用一") - private String standbyOne; + @Excel(name = "已出库数量") + private Integer outBoundQuantity; + @Excel(name = "未出库数量") + private Integer unBoundQuantity; + private String instanceId; + private String instanceType; + private String applyUser; - /** 结案人 */ - @Excel(name = "结案人") - private String auditName; - /** 备用二 */ - @Excel(name = "备用二") - private String standbyTwo; + public Long getSalesOrderId() { + return salesOrderId; + } - /** 结案时间 */ - @Excel(name = "结案时间") - private String auditTime; + public void setSalesOrderId(Long salesOrderId) { + this.salesOrderId = salesOrderId; + } - /** 结案备注 */ - @Excel(name = "结案备注") - private String auditRemarks; + public String getUseStatus() { + return useStatus; + } - /** 客户使用否 */ - @Excel(name = "客户使用否") - private String customerUseOrNot; + public void setUseStatus(String useStatus) { + this.useStatus = useStatus; + } - /** 对账否 */ - @Excel(name = "对账否") - private String accountReconciliationOrNot; + public String getAuditStatus() { + return auditStatus; + } - /** 对账人 */ - @Excel(name = "对账人") - private String accountReconciliationPerson; + public void setAuditStatus(String auditStatus) { + this.auditStatus = auditStatus; + } - /** 对账时间 */ - @Excel(name = "对账时间") - private String accountReconciliationTime; + public String getDeliveryStatus() { + return deliveryStatus; + } - /** 是否开国税发票 */ - @Excel(name = "是否开国税发票") - private String nationalTaxBill; + public void setDeliveryStatus(String deliveryStatus) { + this.deliveryStatus = deliveryStatus; + } - /** 录入时间 */ - @Excel(name = "录入时间") - private String firstAddTime; + public String getCloseStatus() { + return closeStatus; + } - /** 修改时间 */ - @Excel(name = "修改时间") - private String updateInfoTime; - public void setSalesOrderId(Long salesOrderId) - { - this.salesOrderId = salesOrderId; + public void setCloseStatus(String closeStatus) { + this.closeStatus = closeStatus; } - public Long getSalesOrderId() - { - return salesOrderId; + public String getMakeStatus() { + return makeStatus; } - public void setSalesOrderCode(String salesOrderCode) - { - this.salesOrderCode = salesOrderCode; + + public void setMakeStatus(String makeStatus) { + this.makeStatus = makeStatus; } - public String getSalesOrderCode() - { + public String getSalesOrderCode() { return salesOrderCode; } - public void setSalesOrderNumber(String salesOrderNumber) - { - this.salesOrderNumber = salesOrderNumber; + + public void setSalesOrderCode(String salesOrderCode) { + this.salesOrderCode = salesOrderCode; } - public String getSalesOrderNumber() - { + public String getSalesOrderNumber() { return salesOrderNumber; } - public void setAppointmentNumber(String appointmentNumber) - { - this.appointmentNumber = appointmentNumber; + + public void setSalesOrderNumber(String salesOrderNumber) { + this.salesOrderNumber = salesOrderNumber; } - public String getAppointmentNumber() - { - return appointmentNumber; + public String getSalesOrderType() { + return salesOrderType; } - public void setEnterpriseCode(String enterpriseCode) - { - this.enterpriseCode = enterpriseCode; + + public void setSalesOrderType(String salesOrderType) { + this.salesOrderType = salesOrderType; } - public String getEnterpriseCode() - { + public String getEnterpriseCode() { return enterpriseCode; } - public void setEnterpriseName(String enterpriseName) - { - this.enterpriseName = enterpriseName; + + public void setEnterpriseCode(String enterpriseCode) { + this.enterpriseCode = enterpriseCode; } - public String getEnterpriseName() - { + 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 void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; } - public String getDeliveryConditions() - { - return deliveryConditions; - } - public void setDeliveryMethod(String deliveryMethod) - { - this.deliveryMethod = deliveryMethod; + public String getCustomerPhone() { + return customerPhone; } - public String getDeliveryMethod() - { - return deliveryMethod; - } - public void setOrderReceivingMode(String orderReceivingMode) - { - this.orderReceivingMode = orderReceivingMode; + public void setCustomerPhone(String customerPhone) { + this.customerPhone = customerPhone; } - 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 getMaterialSum() { + return materialSum; } - public String getCustomerFactory() - { - return customerFactory; - } - public void setContactNumber(String contactNumber) - { - this.contactNumber = contactNumber; + public void setMaterialSum(String materialSum) { + this.materialSum = materialSum; } - public String getContactNumber() - { - return contactNumber; - } - public void setBusinessMembers(String businessMembers) - { - this.businessMembers = businessMembers; + public String getEnterpriseSum() { + return enterpriseSum; } - public String getBusinessMembers() - { - return businessMembers; - } - public void setCustomerFax(String customerFax) - { - this.customerFax = customerFax; + public void setEnterpriseSum(String enterpriseSum) { + this.enterpriseSum = enterpriseSum; } - public String getCustomerFax() - { - return customerFax; - } - public void setDeliveryAddress(String deliveryAddress) - { - this.deliveryAddress = deliveryAddress; + public Double getNoRmbPrice() { + return noRmbPrice; } - public String getDeliveryAddress() - { - return deliveryAddress; - } - public void setOrderReceivingTime(String orderReceivingTime) - { - this.orderReceivingTime = orderReceivingTime; + public void setNoRmbPrice(Double noRmbPrice) { + this.noRmbPrice = noRmbPrice; } - public String getOrderReceivingTime() - { - return orderReceivingTime; - } - public void setBillingTime(String billingTime) - { - this.billingTime = billingTime; + public Double getNoRmbSum() { + return noRmbSum; } - public String getBillingTime() - { - return billingTime; + public void setNoRmbSum(Double noRmbSum) { + this.noRmbSum = noRmbSum; } - public void setCustomerRemarks(String customerRemarks) - { - this.customerRemarks = customerRemarks; + + public Double getRmbPrice() { + return rmbPrice; } - public String getCustomerRemarks() - { - return customerRemarks; + public void setRmbPrice(Double rmbPrice) { + this.rmbPrice = rmbPrice; } - public void setCurrentInventory(String currentInventory) - { - this.currentInventory = currentInventory; + + public Double getRmbTaxSum() { + return rmbTaxSum; } - public String getCurrentInventory() - { - return currentInventory; + public void setRmbTaxSum(Double rmbTaxSum) { + this.rmbTaxSum = rmbTaxSum; } - public void setCreditLimit(String creditLimit) - { - this.creditLimit = creditLimit; + + public Double getNoUsdPrice() { + return noUsdPrice; } - public String getCreditLimit() - { - return creditLimit; + public void setNoUsdPrice(Double noUsdPrice) { + this.noUsdPrice = noUsdPrice; } - public void setUnpaidAmount(String unpaidAmount) - { - this.unpaidAmount = unpaidAmount; + + public Double getNoUsdSum() { + return noUsdSum; } - public String getUnpaidAmount() - { - return unpaidAmount; + public void setNoUsdSum(Double noUsdSum) { + this.noUsdSum = noUsdSum; } - public void setAvailableCredit(String availableCredit) - { - this.availableCredit = availableCredit; + + public Double getUsdPrice() { + return usdPrice; } - public String getAvailableCredit() - { - return availableCredit; + public void setUsdPrice(Double usdPrice) { + this.usdPrice = usdPrice; } - public void setConfirmTax(String confirmTax) - { - this.confirmTax = confirmTax; + + public String getUsdTaxSum() { + return usdTaxSum; } - public String getConfirmTax() - { - return confirmTax; + public void setUsdTaxSum(String usdTaxSum) { + this.usdTaxSum = usdTaxSum; } - public void setTaxRate(String taxRate) - { - this.taxRate = taxRate; + + public String getDeliveryTime() { + return deliveryTime; } - public String getTaxRate() - { - return taxRate; + public void setDeliveryTime(String deliveryTime) { + this.deliveryTime = deliveryTime; } - public void setTotalAmount(String totalAmount) - { - this.totalAmount = totalAmount; + + public String getDeliveryConditions() { + return deliveryConditions; } - public String getTotalAmount() - { - return totalAmount; + public void setDeliveryConditions(String deliveryConditions) { + this.deliveryConditions = deliveryConditions; } - public void setModificationTime(String modificationTime) - { - this.modificationTime = modificationTime; + + public String getDeliveryMethod() { + return deliveryMethod; } - public String getModificationTime() - { - return modificationTime; + public void setDeliveryMethod(String deliveryMethod) { + this.deliveryMethod = deliveryMethod; } - public void setConfirmTime(String confirmTime) - { - this.confirmTime = confirmTime; + + public String getDeliveryAddress() { + return deliveryAddress; } - public String getConfirmTime() - { - return confirmTime; + public void setDeliveryAddress(String deliveryAddress) { + this.deliveryAddress = deliveryAddress; } - public void setConfirmNo(String confirmNo) - { - this.confirmNo = confirmNo; + + public String getPaymentTerms() { + return paymentTerms; } - public String getConfirmNo() - { - return confirmNo; + public void setPaymentTerms(String paymentTerms) { + this.paymentTerms = paymentTerms; } - public void setConfirmName(String confirmName) - { - this.confirmName = confirmName; + + public String getOrderReceivingMode() { + return orderReceivingMode; } - public String getConfirmName() - { - return confirmName; + public void setOrderReceivingMode(String orderReceivingMode) { + this.orderReceivingMode = orderReceivingMode; } - public void setAuditNo(String auditNo) - { - this.auditNo = auditNo; + + public String getOrderReceivingTime() { + return orderReceivingTime; } - public String getAuditNo() - { - return auditNo; + public void setOrderReceivingTime(String orderReceivingTime) { + this.orderReceivingTime = orderReceivingTime; } - public void setStandbyOne(String standbyOne) - { - this.standbyOne = standbyOne; + + public String getCustomerContact() { + return customerContact; } - public String getStandbyOne() - { - return standbyOne; + public void setCustomerContact(String customerContact) { + this.customerContact = customerContact; } - public void setAuditName(String auditName) - { - this.auditName = auditName; + + public String getContactNumber() { + return contactNumber; } - public String getAuditName() - { - return auditName; + public void setContactNumber(String contactNumber) { + this.contactNumber = contactNumber; } - public void setStandbyTwo(String standbyTwo) - { - this.standbyTwo = standbyTwo; + + public String getCustomerFax() { + return customerFax; } - public String getStandbyTwo() - { - return standbyTwo; + public void setCustomerFax(String customerFax) { + this.customerFax = customerFax; } - public void setAuditTime(String auditTime) - { - this.auditTime = auditTime; + + public String getBusinessMembers() { + return businessMembers; } - public String getAuditTime() - { - return auditTime; + public void setBusinessMembers(String businessMembers) { + this.businessMembers = businessMembers; } - public void setAuditRemarks(String auditRemarks) - { - this.auditRemarks = auditRemarks; + + public String getConfirmTax() { + return confirmTax; } - public String getAuditRemarks() - { - return auditRemarks; + public void setConfirmTax(String confirmTax) { + this.confirmTax = confirmTax; } - public String getCustomerUseOrNot() { - return customerUseOrNot; + public String getTaxRate() { + return taxRate; } - public void setCustomerUseOrNot(String customerUseOrNot) { - this.customerUseOrNot = customerUseOrNot; + public void setTaxRate(String taxRate) { + this.taxRate = taxRate; } - public String getAccountReconciliationOrNot() { - return accountReconciliationOrNot; + public String getTotalAmount() { + return totalAmount; } - public void setAccountReconciliationOrNot(String accountReconciliationOrNot) { - this.accountReconciliationOrNot = accountReconciliationOrNot; + public void setTotalAmount(String totalAmount) { + this.totalAmount = totalAmount; } - public String getAccountReconciliationPerson() { - return accountReconciliationPerson; + public String getFileUpload() { + return fileUpload; } - public void setAccountReconciliationPerson(String accountReconciliationPerson) { - this.accountReconciliationPerson = accountReconciliationPerson; + public void setFileUpload(String fileUpload) { + this.fileUpload = fileUpload; } - public String getAccountReconciliationTime() { - return accountReconciliationTime; + public String getStandbyOne() { + return standbyOne; } - public void setAccountReconciliationTime(String accountReconciliationTime) { - this.accountReconciliationTime = accountReconciliationTime; + public void setStandbyOne(String standbyOne) { + this.standbyOne = standbyOne; } - public String getNationalTaxBill() { - return nationalTaxBill; + public String getStandbyTwo() { + return standbyTwo; } - public void setNationalTaxBill(String nationalTaxBill) { - this.nationalTaxBill = nationalTaxBill; + public void setStandbyTwo(String standbyTwo) { + this.standbyTwo = standbyTwo; } public String getFirstAddTime() { @@ -570,60 +467,110 @@ public class SysSalesOrder extends BaseEntity this.updateInfoTime = updateInfoTime; } - public String getFileUpload() { - return fileUpload; + public String getModificationTime() { + return modificationTime; } - public void setFileUpload(String fileUpload) { - this.fileUpload = fileUpload; + public void setModificationTime(String modificationTime) { + this.modificationTime = modificationTime; + } + + public String getTradeClause() { + return tradeClause; + } + + public void setTradeClause(String tradeClause) { + this.tradeClause = tradeClause; + } + + public Integer getOutboundQuantity() { + return outBoundQuantity; + } + + public void setOutboundQuantity(Integer outBoundQuantity) { + this.outBoundQuantity = outBoundQuantity; + } + + public Integer getUnBoundQuantity() { + return unBoundQuantity; + } + + public void setUnBoundQuantity(Integer unBoundQuantity) { + this.unBoundQuantity = unBoundQuantity; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("salesOrderId", getSalesOrderId()) - .append("salesOrderCode", getSalesOrderCode()) - .append("salesOrderNumber", getSalesOrderNumber()) - .append("appointmentNumber", getAppointmentNumber()) - .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("confirmNo", getConfirmNo()) - .append("confirmName", getConfirmName()) - .append("auditNo", getAuditNo()) - .append("standbyOne", getStandbyOne()) - .append("auditName", getAuditName()) - .append("standbyTwo", getStandbyTwo()) - .append("auditTime", getAuditTime()) - .append("customerUseOrNot", getAccountReconciliationOrNot()) - .append("accountReconciliationOrNot", getAccountReconciliationOrNot()) - .append("accountReconciliationPerson", getAccountReconciliationPerson()) - .append("accountReconciliationTime", getAccountReconciliationTime()) - .append("nationalTaxBill", getNationalTaxBill()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .append("fileUpload", getFileUpload()) - .toString(); + return Objects.toStringHelper(this) + .add("salesOrderId", salesOrderId) + .add("useStatus", useStatus) + .add("auditStatus", auditStatus) + .add("deliveryStatus", deliveryStatus) + .add("closeStatus", closeStatus) + .add("makeStatus", makeStatus) + .add("salesOrderCode", salesOrderCode) + .add("salesOrderNumber", salesOrderNumber) + .add("salesOrderType", salesOrderType) + .add("enterpriseCode", enterpriseCode) + .add("enterpriseName", enterpriseName) + .add("customerPhone", customerPhone) + .add("materialSum", materialSum) + .add("enterpriseSum", enterpriseSum) + .add("noRmbPrice", noRmbPrice) + .add("noRmbSum", noRmbSum) + .add("rmbPrice", rmbPrice) + .add("rmbTaxSum", rmbTaxSum) + .add("noUsdPrice", noUsdPrice) + .add("noUsdSum", noUsdSum) + .add("usdPrice", usdPrice) + .add("usdTaxSum", usdTaxSum) + .add("deliveryTime", deliveryTime) + .add("deliveryConditions", deliveryConditions) + .add("deliveryMethod", deliveryMethod) + .add("deliveryAddress", deliveryAddress) + .add("paymentTerms", paymentTerms) + .add("orderReceivingMode", orderReceivingMode) + .add("orderReceivingTime", orderReceivingTime) + .add("customerContact", customerContact) + .add("contactNumber", contactNumber) + .add("customerFax", customerFax) + .add("businessMembers", businessMembers) + .add("confirmTax", confirmTax) + .add("modificationTime", modificationTime) + .add("taxRate", taxRate) + .add("totalAmount", totalAmount) + .add("fileUpload", fileUpload) + .add("standbyOne", standbyOne) + .add("standbyTwo", standbyTwo) + .add("firstAddTime", firstAddTime) + .add("updateInfoTime", updateInfoTime) + .add("tradeClause", tradeClause) + .add("outboundQuantity", outBoundQuantity) + .add("unBoundQuantity", unBoundQuantity) + .toString(); + } + + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + + public String getApplyUser() { + return applyUser; + } + + public void setApplyUser(String applyUser) { + this.applyUser = applyUser; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java new file mode 100644 index 00000000..925ccf13 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderVo.java @@ -0,0 +1,108 @@ +package com.ruoyi.system.domain; + +import java.util.Date; + +public class SysSalesOrderVo extends SysSalesOrder{ + /** 申请人姓名 */ + private String applyUserName; + /** 任务ID */ + private String taskId; + /** 任务名称 */ + private String taskName; + /** 办理时间 */ + private Date doneTime; + /** 创建人 */ + private String createUserName; + /** 流程实例状态 1 激活 2 挂起 */ + private String suspendState; + /** 待办用户id */ + private String todoUserId; + /** 流程实例类型名称 */ + private String instanceTypeName; + + /** + * 关键词 + */ + private String keyword; + private String applyTitle; + + public String getApplyUserName() { + return applyUserName; + } + + public void setApplyUserName(String applyUserName) { + this.applyUserName = applyUserName; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public Date getDoneTime() { + return doneTime; + } + + public void setDoneTime(Date doneTime) { + this.doneTime = doneTime; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getSuspendState() { + return suspendState; + } + + public void setSuspendState(String suspendState) { + this.suspendState = suspendState; + } + + public String getTodoUserId() { + return todoUserId; + } + + public void setTodoUserId(String todoUserId) { + this.todoUserId = todoUserId; + } + + public String getInstanceTypeName() { + return instanceTypeName; + } + + public void setInstanceTypeName(String instanceTypeName) { + this.instanceTypeName = instanceTypeName; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getApplyTitle() { + return applyTitle; + } + + public void setApplyTitle(String applyTitle) { + this.applyTitle = applyTitle; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/exportDto/SysCustomerDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/exportDto/SysCustomerDto.java index ad46317c..16f8bf0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/exportDto/SysCustomerDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/exportDto/SysCustomerDto.java @@ -2,6 +2,7 @@ package com.ruoyi.system.domain.exportDto; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysCustomer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,10 +12,11 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2022-11-02 */ -public class SysCustomerDto extends BaseEntity +public class SysCustomerDto extends SysCustomer { private static final long serialVersionUID = 1L; - + /** 客户id */ + private Long id; /** 客户id */ private Long customerId; @@ -600,6 +602,14 @@ public class SysCustomerDto extends BaseEntity return countryNumber; } + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java index 6d928e57..cd3ef51c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java @@ -48,10 +48,10 @@ public interface SysCustomerMapper /** * 删除客户基本信息 * - * @param customerId 客户基本信息ID + * @param id 客户基本信息ID * @return 结果 */ - int deleteSysCustomerById(Long customerId); + int deleteSysCustomerById(Long id); /** * 批量删除客户基本信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java index f543a50e..cba34ea8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteChildMapper.java @@ -13,6 +13,8 @@ public interface SysCustomerQuoteChildMapper { int updateSysCustomerQuoteChild(SysCustomerQuoteChild sysCustomerQuoteChild); + List selectSysCustomerQuoteChildByQuoteId(String quoteId); + int deleteSysCustomerQuoteChildByIds(String[] ids); /*删除ids中的quoteId的所有子项*/ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java index dc47880e..cb78d2ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerQuoteMapper.java @@ -88,4 +88,6 @@ public interface SysCustomerQuoteMapper public int deleteSysCustomerQuotechildByQuoteId(Long id); public SysCustomerQuote selectSysCustomerByCustomerQuoteCode(String customerCode); + + List selectSysCustomerQuoteBycode(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java index 09c1bd23..ae8c8c5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSalesOrderMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.SysSalesOrder; +import com.ruoyi.system.domain.SysSalesOrderVo; /** * 销售订单Mapper接口 @@ -13,11 +14,11 @@ public interface SysSalesOrderMapper { /** * 查询销售订单 - * + * * @param salesOrderId 销售订单ID * @return 销售订单 */ - public SysSalesOrder selectSysSalesOrderById(Long salesOrderId); + public SysSalesOrderVo selectSysSalesOrderById(Long salesOrderId); /** * 查询销售订单列表 @@ -25,7 +26,7 @@ public interface SysSalesOrderMapper * @param sysSalesOrder 销售订单 * @return 销售订单集合 */ - public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder); + public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder); /** * 新增销售订单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteChildService.java index 06cece40..683b7f79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteChildService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteChildService.java @@ -10,6 +10,7 @@ public interface ISysCustomerQuoteChildService { int insertSysCustomerQuoteChild(SysCustomerQuoteChild sysCustomerQuoteChild); SysCustomerQuoteChild selectSysCustomerQuoteChildById(Long id); + List selectSysCustomerQuoteChildByQuoteId(String quoteId); int updateSysCustomerQuoteChild(SysCustomerQuoteChild sysCustomerQuoteChild); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java index 2b3db089..02723486 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerQuoteService.java @@ -62,7 +62,7 @@ public interface ISysCustomerQuoteService int deleteSysCustomerQuoteByIds(String[] ids); - List selectSysCustomerQuoteBycode(); + List selectSysCustomerQuoteBycode(); List selectSysCustomerByCustomerCode(String customerCode); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java index faa45607..f9015243 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; +import com.ruoyi.system.domain.SysSalesOrderVo; import com.ruoyi.system.domain.SysSalesOrder; +import com.ruoyi.system.domain.SysSalesOrderVo; import java.util.List; @@ -14,11 +16,11 @@ public interface ISysSalesOrderService { /** * 查询销售订单 - * + * * @param salesOrderId 销售订单ID * @return 销售订单 */ - public SysSalesOrder selectSysSalesOrderById(Long salesOrderId); + public SysSalesOrderVo selectSysSalesOrderById(Long salesOrderId); /** * 查询销售订单列表 @@ -26,7 +28,9 @@ public interface ISysSalesOrderService * @param sysSalesOrder 销售订单 * @return 销售订单集合 */ - public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder); + List selectSysSalesOrderList(SysSalesOrder sysSalesOrder); + + List selectSysSalesOrderList(SysSalesOrderVo sysSalesOrderVo); /** * 新增销售订单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteChildServiceImpl.java index f671935c..c4772a63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteChildServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteChildServiceImpl.java @@ -3,14 +3,16 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.SysCustomerQuoteChild; import com.ruoyi.system.mapper.SysCustomerQuoteChildMapper; import com.ruoyi.system.service.ISysCustomerQuoteChildService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service public class SysCustomerQuoteChildServiceImpl implements ISysCustomerQuoteChildService { + @Autowired private SysCustomerQuoteChildMapper sysCustomerQuoteChildMapper; @Override - public List selectSysCustomerQuoteChildList(SysCustomerQuoteChild sysCustomerQuoteChild) { + public List selectSysCustomerQuoteChildList (SysCustomerQuoteChild sysCustomerQuoteChild) { return sysCustomerQuoteChildMapper.selectSysCustomerQuoteChildList(sysCustomerQuoteChild); } @@ -24,6 +26,11 @@ public class SysCustomerQuoteChildServiceImpl implements ISysCustomerQuoteChildS return sysCustomerQuoteChildMapper.selectSysCustomerQuoteChildById(id); } + @Override + public List selectSysCustomerQuoteChildByQuoteId(String quoteId) { + return sysCustomerQuoteChildMapper.selectSysCustomerQuoteChildByQuoteId(quoteId); + } + @Override public int updateSysCustomerQuoteChild(SysCustomerQuoteChild sysCustomerQuoteChild) { return sysCustomerQuoteChildMapper.updateSysCustomerQuoteChild(sysCustomerQuoteChild); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index f4094272..eb34ce0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @Service @@ -25,9 +26,6 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public SysCustomerQuote selectSysCustomerQuoteById(Long id) { SysCustomerQuote sysCustomerQuote = sysCustomerQuoteMapper.selectSysCustomerQuoteById(id); - SysCustomerQuoteChild sysCustomerQuoteChild = new SysCustomerQuoteChild(); - sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getId()); - sysCustomerQuote.setSysCustomerQuoteChildList(sysCustomerQuoteChildMapper.selectSysCustomerQuoteChildList(sysCustomerQuoteChild)); return sysCustomerQuote; } @@ -41,12 +39,14 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { String loginName = ShiroUtils.getLoginName(); sysCustomerQuote.setCreateBy(loginName); sysCustomerQuoteMapper.insertSysCustomerQuote(sysCustomerQuote); - sysCustomerQuote.getId(); int i = 0; - for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuote.getSysCustomerQuoteChildList()) { - sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getId()); - sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); - i++; + int s = sysCustomerQuote.getSysCustomerQuotechildList().size(); + if (s >= 1) { + for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuote.getSysCustomerQuotechildList()) { + sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); + i++; + } } return i; } @@ -54,12 +54,21 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public int updateSysCustomerQuote(SysCustomerQuote sysCustomerQuote) { String loginName = ShiroUtils.getLoginName(); - sysCustomerQuote.setCreateBy(loginName); + sysCustomerQuote.setUpdateBy(loginName); sysCustomerQuoteMapper.updateSysCustomerQuote(sysCustomerQuote); int i = 0; - for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuote.getSysCustomerQuoteChildList()) { - sysCustomerQuoteChildMapper.updateSysCustomerQuoteChild(sysCustomerQuoteChild); - i++; + int s = sysCustomerQuote.getSysCustomerQuotechildList().size(); + if (s >= 1) { + for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuote.getSysCustomerQuotechildList()) { + if (sysCustomerQuoteChild.getId() == null){ + sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); + continue; + } + sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChildMapper.updateSysCustomerQuoteChild(sysCustomerQuoteChild); + i++; + } } return i; } @@ -76,10 +85,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { } @Override - public List selectSysCustomerQuoteBycode() { - return null; + public List selectSysCustomerQuoteBycode() { + return sysCustomerQuoteMapper.selectSysCustomerQuoteBycode(); } + @Override public List selectSysCustomerByCustomerCode(String customerCode) { return Collections.singletonList(sysCustomerQuoteMapper.selectSysCustomerByCustomerQuoteCode(customerCode)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index b8849541..da85b11d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -1,14 +1,26 @@ package com.ruoyi.system.service.impl; +import com.github.pagehelper.Page; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.service.ICommonService; +import com.ruoyi.process.general.service.IProcessService; +import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper; +import com.ruoyi.system.domain.SysSalesOrderVo; import com.ruoyi.system.domain.SysSalesOrder; import com.ruoyi.system.mapper.SysSalesOrderMapper; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.ISysAttachFileService; +import com.ruoyi.system.service.ISysAttachService; +import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysSalesOrderService; +import org.activiti.engine.TaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.List; /** @@ -26,28 +38,80 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Autowired private RedisCache redisCache; + @Autowired + private ISysAttachService attachService; + + @Autowired + private ISysAttachFileService attachFileService; + + @Autowired + private ICommonService commonService; + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private TaskService taskService; + + @Autowired + private BizTodoItemMapper todoItemMapper; + + @Autowired + private IProcessService processService; + + @Autowired + private ISysRoleService roleService; + /** * 查询销售订单 - * + * * @param salesOrderId 销售订单ID * @return 销售订单 */ @Override - public SysSalesOrder selectSysSalesOrderById(Long salesOrderId) + public SysSalesOrderVo selectSysSalesOrderById(Long salesOrderId) { - return sysSalesOrderMapper.selectSysSalesOrderById(salesOrderId); + SysSalesOrderVo sysSalesOrderVo = sysSalesOrderMapper.selectSysSalesOrderById(salesOrderId); + SysUser sysUser = userMapper.selectUserByLoginName(sysSalesOrderVo.getApplyUserName()); + if (sysUser != null) { + sysSalesOrderVo.setApplyUserName(sysUser.getUserName()); + } + return sysSalesOrderVo; + } + + @Override + public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder) { + return null; } /** * 查询销售订单列表 * - * @param sysSalesOrder 销售订单 + * @param sysSalesOrderVo 销售订单 * @return 销售订单 */ @Override - public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder) + public List selectSysSalesOrderList(SysSalesOrderVo sysSalesOrderVo) { - return sysSalesOrderMapper.selectSysSalesOrderList(sysSalesOrder); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + + //PageHelper 仅对第一List分页有效 + Page list = (Page) sysSalesOrderMapper.selectSysSalesOrderList(sysSalesOrderVo); + Page page = new Page<>(); + for(SysSalesOrderVo sysSalesOrderVo1 : list){ + SysUser sysUser = userMapper.selectUserByLoginName(sysSalesOrderVo1.getCreateBy()); + if (sysUser != null) { + sysSalesOrderVo.setCreateBy(sysUser.getUserName()); + } + SysUser sysUser2 = userMapper.selectUserByLoginName(sysSalesOrderVo.getApplyUser()); + if (sysUser2!=null){ + sysSalesOrderVo.setApplyUserName(sysUser2.getUserName()); + } + + } + return list; } /** diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml index 5f7786b7..fe960cb1 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_name like concat('%', #{enterpriseName}, '%') and customer_name like concat('%', #{customerName}, '%') and customer_fax like concat('%', #{customerFax} '%') + and first_add_time between #{params.beginCreateTime} and #{params.endCreateTime} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 489661d6..dfc16e61 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -90,12 +90,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and customer_purser like concat('%', #{customerPurser}, '%') and customer_abbreviation like concat('%', #{customer_abbreviation}, '%') and delivery_address like concat('%', #{deliveryAddress}, '%') + and first_add_time between #{params.beginCreateTime} and #{params.endCreateTime} + and customer_sign = #{customerSign} - select quoteId,id, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl, - `describe`,countTax, usdTax, materialNum,materialSole, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum, - materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by, - update_time, remark, use_status,audit_status from sys_customer_quotechild + - - where id = #{id} - - + + insert into sys_customer_quotechild quoteId, @@ -91,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time, remark, - useStatus,auditStatus + use_status,audit_status #{quoteId}, @@ -156,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_customer_quotechild set delFlag = 1 from sys_customer_quotechild where id = #{id} + update sys_customer_quotechild set delFlag = 1 where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml index d38e36d3..17689671 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml @@ -5,38 +5,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select id,supplierCode,customerCode,enterprise,enterpriseSum,common_currency, - rmbTax,usdTax,noRmb,noRmbSum,rmb,rmbSum,noUsd,noUsdSum,usd,usdSum,business_members, - degin_flag,del_flag,create_by,create_time,update_by,update_time,remark from sys_customer_quote - + select id,supplierCode,customerCode,customerName,pricingDate,enterprise,enterpriseSum,common_currency, + confirm_fax,rmbTax,usdTax,noRmb,noRmbSum,rmb,rmbSum,noUsd,noUsdSum,usd,usdSum,business_members, + degin_flag,del_flag,create_by,create_time,update_by,update_time,remark, + audit_status,use_status + from sys_customer_quote @@ -54,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select customerCode,cusotomerName from sys_customer_quote @@ -62,17 +69,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where customerCode = #{cusotomerCode} - - insert into sys_customer_quote supplierCode, customerCode, customerName, + pricingDate, enterprise, enterpriseSum, common_currency, + confirm_fax, rmbTax, usdTax, noRmb, @@ -88,17 +95,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, - degin_flag, - del_flag, + audit_status, + use_status, create_time, #{supplierCode}, #{customerCode}, #{customerName}, + #{pricingDate}, #{enterprise}, #{enterpriseSum}, #{commonCurrency}, + #{confirmFax}, #{rmbTax}, #{usdTax}, #{noRmb}, @@ -126,9 +135,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" supplierCode = #{supplierCode}, customerCode = #{customerCode}, customerName = #{customerName}, + pricingDate = #{pricingDate}, enterprise = #{enterprise}, enterpriseSum = #{enterpriseSum}, - common_currency = #{common_currency},, + common_currency = #{common_currency}, + confirm_fax = #{confirmFax}, rmbTax = #{rmbTax}, usdTax = #{usdTax}, noRmb = #{noRmb}, @@ -140,22 +151,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" usd = #{usd}, usdSum = #{usdSum}, businessMembers = #{businessMembers}, - degin_flag = #{deginFlag}, create_by = #{createBy}, update_by = #{updateBy}, - update_time = #{updateBy}, remark = #{remark}, - del_flag, - update_time = CONCAT_WS(',',NOW(),update_time), + audit_status = #{auditStatus}, + use_status = #{useStatus}, + update_time = now() - where customer_id = #{customerId} + where id = #{id} - delete from sys_customer_quote where id = #{id} + update sys_customer_quote set use_status = 1 from sys_customer_quote where id = #{id} - delete from sys_customer_quote where id in + update sys_customer_quote set use_status = 1 sys_customer_quote where id in #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index 3227a2e1..444a01e9 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -5,52 +5,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select sales_order_id, 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, standby_one, audit_name, standby_two, audit_time, audit_remarks, national_tax_bill, first_add_time, update_info_time, file_upload - from sys_sales_order + select sales_order_id, use_status, audit_status, make_status, delivery_status, + close_status, sales_order_code, sales_order_number, sales_order_type,enterprise_code, + enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, rmbTaxSum, + noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time, + delivery_conditions, delivery_method, delivery_address, order_receiving_mode, + customer_contact, contact_number, customer_fax, business_members, confirm_tax, tax_rate, + total_amount, billing_time, modification_time,standby_one, standby_two, first_add_time, + update_info_time, file_upload, create_by, create_time, update_by, update_time, remark, + out_bound_quantity, un_bound_quantity, trade_clause + from sys_sales_order @@ -85,82 +96,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sales_order_code, sales_order_number, - appointment_number, enterprise_code, enterprise_name, payment_terms, + delivery_time, + #{deliveryAddress}, 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, + order_receiving_mode, confirm_tax, tax_rate, total_amount, modification_time, - confirm_time, - confirm_no, - confirm_name, - audit_no, standby_one, - audit_name, standby_two, - audit_time, - audit_remarks, - national_tax_bill, file_upload, - first_add_time, + create_by, + remark, + out_bound_quantity, + un_bound_quantity, + trade_clause, + first_add_time,create_time #{salesOrderCode}, #{salesOrderNumber}, - #{appointmentNumber}, #{enterpriseCode}, #{enterpriseName}, #{paymentTerms}, + #{deliveryTime}, + #{deliveryStatus}, #{deliveryConditions}, #{deliveryMethod}, - #{orderReceivingMode}, #{customerContact}, - #{customerFactory}, #{contactNumber}, #{businessMembers}, #{customerFax}, #{deliveryAddress}, #{orderReceivingTime}, - #{billingTime}, - #{customerRemarks}, - #{currentInventory}, - #{creditLimit}, - #{unpaidAmount}, - #{availableCredit}, + #{orderReceivingMode}, #{confirmTax}, #{taxRate}, #{totalAmount}, #{modificationTime}, - #{confirmTime}, - #{confirmNo}, - #{confirmName}, - #{auditNo}, #{standbyOne}, - #{auditName}, #{standbyTwo}, - #{auditTime}, - #{auditRemarks}, - #{nationalTaxBill}, #{fileUpload}, - now(), + #{createBy}, + #{remark}, + #{outBoundQuantity}, + #{unBoundQuantity}, + #{tradeClause}, + now(),now() @@ -174,47 +167,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_name = #{enterpriseName}, payment_terms = #{paymentTerms}, delivery_conditions = #{deliveryConditions}, + delivery_time = #{deliveryTime}, + delivery_address = #{deliveryAddress}, delivery_method = #{deliveryMethod}, order_receiving_mode = #{orderReceivingMode}, customer_contact = #{customerContact}, - customer_factory = #{customerFactory}, contact_number = #{contactNumber}, business_members = #{businessMembers}, customer_fax = #{customerFax}, delivery_address = #{deliveryAddress}, order_receiving_time = #{orderReceivingTime}, - billing_time = #{billingTime}, - customer_remarks = #{customerRemarks}, - current_inventory = #{currentInventory}, credit_limit = #{creditLimit}, unpaid_amount = #{unpaidAmount}, - available_credit = #{availableCredit}, confirm_tax = #{confirmTax}, tax_rate = #{taxRate}, total_amount = #{totalAmount}, modification_time = #{modificationTime}, - confirm_time = #{confirmTime}, - confirm_no = #{confirmNo}, - confirm_name = #{confirmName}, - audit_no = #{auditNo}, standby_one = #{standbyOne}, - audit_name = #{auditName}, standby_two = #{standbyTwo}, - audit_time = #{auditTime}, - audit_remarks = #{auditRemarks}, - national_tax_bill = #{nationalTaxBill}, file_upload = #{fileUpload}, + update_by = #{updateBy}, + remark = #{remark}, + out_bound_quantity = #{outBoundQuantity}, + un_bound_quantity = #{unBoundQuantity} + trade_clause = #{tradeClause}, update_info_time = CONCAT_WS(',',NOW(),update_info_time), + update_time = #{updateTime} where sales_order_id = #{salesOrderId} - delete from sys_sales_order where sales_order_id = #{salesOrderId} + update sys_sales_order set use_status = 1 where sales_order_id = #{salesOrderId} - - delete from sys_sales_order where sales_order_id in + update sys_sales_order set use_status = 1 where sales_order_id in #{salesOrderId} diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index 687d0b94..ae6c6384 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -172,59 +172,11 @@ minimumInputLength: 1 } }); - //todo 物料名称下拉框 - // $("#materialName").select2({ - // theme: "bootstrap", - // allowClear: true, - // placeholder: "请选择一个料号名称", - // ajax:{ - // type: "get", - // url:ctx + "erp/material/getMaterialSelList", - // dataType:"json", - // delay:250, - // data:function(params){ - // var searchVal = params.term; - // var obj = { - // keyword: searchVal - // }; - // return obj; - // }, - // cache:true, - // processResults: function (res, params) { - // var options = []; - // if(res.code==0){ - // var resultList = res.data; - // console.log(resultList); - // for(var i= 0, len=resultList.length;i 100) { + return '损耗率必须大于等于0小于等于100'; + } } } }, diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 12a40854..56d72b01 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -75,13 +75,20 @@
  • - + +
  • - + +
  • @@ -92,8 +99,11 @@
  • - +
  • @@ -328,7 +338,6 @@ - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index e33021e8..3222b733 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -24,18 +24,11 @@
  • - +
    • -
  • - - -
    • -
  • - - -
  • @@ -54,15 +47,6 @@ 添加 - 导出 @@ -73,13 +57,15 @@ + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 4d9cccfb..944f61fe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -139,7 +139,7 @@
    - +
    @@ -229,7 +229,7 @@
    - +
    @@ -238,7 +238,7 @@
    - +
    @@ -246,14 +246,13 @@
    - +
    -
    - +
    @@ -266,101 +265,39 @@

    计算

    - +
    -
    - + - - + +
    - - - - -
    -
    -
    -
    -
    - 选择报价信息 - - 添加物料 - -
    -
    -
    -
    -
    -
    + + + +
    -
    - -
    - +
    - @@ -369,10 +306,11 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html index 31b8af74..908fdc41 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html @@ -68,130 +68,136 @@
    -
    - + + +
    - +
    - +
    - +
    - +
    - - - - - -
    - +
    -
    - - -
    +
    - +
    -
    - +
    - - - - - +
    -
    - +
    - +
    - +
    - +
    +
    +
    + +
    +
    - +
    - +
    - +
    - - +
    - +
    - +
    - +
    - +
    - +
    - +
    + + +
    - +
    - +
    - +
    - +
    - +
    - +
    -
    - +
    - - - - - - - +
    + + +
    @@ -201,207 +207,106 @@
    - +
    -
    - - +
    + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • - +
    • -
  • - - -
  • - +
  • @@ -126,39 +122,38 @@
  • - +
  • - +
  • - +
  • - +
  • - +
  • - -
    • -
  • - - @@ -181,30 +176,10 @@ -
    @@ -212,426 +187,38 @@
    - - - - - - - - - - - - -
    订单已确认
    - - +