From c74fa3a583b448c7f4166b96369b30a999b3cfbc Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Wed, 17 Apr 2024 19:19:37 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysSalesOrderController.java | 30 +++- .../system/mapper/SysSalesOrderMapper.java | 4 +- .../impl/SysSalesOrderServiceImpl.java | 24 +++- .../mapper/system/SysSalesOrderMapper.xml | 9 +- .../templates/system/salesOrder/add.html | 134 +++++++++--------- .../templates/system/salesOrder/detail.html | 84 +++++++---- .../templates/system/salesOrder/edit.html | 84 +++++++---- .../system/salesOrder/taskModifyApply.html | 20 +-- .../system/salesOrder/taskYwjlVerify.html | 84 +++++++---- .../system/salesOrder/taskYwzgVerify.html | 84 +++++++---- .../system/salesOrder/taskZozjVerify.html | 84 +++++++---- 11 files changed, 393 insertions(+), 248 deletions(-) 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 c45a1238..1610a7fc 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 @@ -10,6 +10,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; @@ -25,9 +26,7 @@ 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 com.ruoyi.system.service.*; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.runtime.ProcessInstance; @@ -80,6 +79,9 @@ public class SysSalesOrderController extends BaseController @Autowired private IProcessService processService; + @Autowired + private ISysUserService sysUserService; + @RequiresPermissions("system:salesOrder:view") @GetMapping() public String salesOrder(ModelMap mmap) @@ -98,13 +100,33 @@ public class SysSalesOrderController extends BaseController { SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); + List list1 = new ArrayList<>(); Set roleKeys = roleService.selectRoleKeys(userId); + SysUser sysUser = new SysUser(); + List sysUserList = sysUserService.selectUserList(sysUser); // 业务员角色只能看到自己创建的数据 if(roleKeys.contains("ywyRole")){ - sysSalesOrderVo.setCreateBy(curUser.getLoginName()); + sysSalesOrderVo.setApplyUser(curUser.getLoginName());startPage(); + List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + return getDataTable(list); + } + if (roleKeys.contains("ywjlRole")){ + startPage(); + List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + list.stream().filter(item -> !Objects.equals(item.getCreateBy(), "admin") + && !Objects.equals(item.getCreateBy(), "yfzj") && Objects.equals(item.getCreateBy(), "ywzg")); + return getDataTable(list); + } + if (roleKeys.contains("ywgzRole")){ + startPage(); + List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + list.stream().filter(item -> !Objects.equals(item.getCreateBy(), "admin") && !Objects.equals(item.getCreateBy(), "yfzj") + && Objects.equals(item.getCreateBy(), "ywjl")); + return getDataTable(list); } startPage(); List list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo); + return getDataTable(list); } 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 d6dbd6c5..60c60b65 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 @@ -25,10 +25,10 @@ public interface SysSalesOrderMapper /** * 查询销售订单列表 * - * @param sysSalesOrder 销售订单 + * @param sysSalesOrderVo 销售订单 * @return 销售订单集合 */ - public List selectSysSalesOrderList(SysSalesOrder sysSalesOrder); + public List selectSysSalesOrderList(SysSalesOrderVo sysSalesOrderVo); /** * 新增销售订单 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 6e3f5847..95a21328 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 @@ -172,7 +172,6 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService sysSalesOrder.setCreateBy(loginName); sysSalesOrder.setCreateTime(DateUtils.getNowDate()); sysSalesOrder.setApplyUser(loginName); - sysSalesOrder.setApplyTime(DateUtils.getNowDate()); int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder); sysSalesOrder.getSalesOrderId(); int s = sysSalesOrder.getSysSalesOrderChildList().size(); @@ -198,14 +197,22 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Override public int updateSysSalesOrder(SysSalesOrder sysSalesOrder) { + SysUser user = userMapper.selectUserByLoginName(sysSalesOrder.getApplyUser()); + String loginName = ShiroUtils.getLoginName(); + sysSalesOrder.setUpdateBy(loginName); + sysSalesOrder.setUpdateTime(DateUtils.getNowDate()); // 存在提交完就流程结束的情况 List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); - for (SysSalesOrderChild sysSalesOrderChild:sysSalesOrderChildList) { - if (sysSalesOrderChild.getId() != null && sysSalesOrderChild.getId() != 0){ - sysSalesOrderChildService.updateSysSalesOrderChild(sysSalesOrderChild); - }else{ - sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); - sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild); + if (sysSalesOrderChildList.isEmpty()){ + return 0; + }else{ + for (SysSalesOrderChild sysSalesOrderChild:sysSalesOrderChildList) { + if (sysSalesOrderChild.getId() != null && sysSalesOrderChild.getId() != 0){ + sysSalesOrderChildService.updateSysSalesOrderChild(sysSalesOrderChild); + }else{ + sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode()); + sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild); + } } } int result = sysSalesOrderMapper.updateSysSalesOrder(sysSalesOrder); @@ -256,6 +263,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService String processInstanceId = processInstance.getProcessInstanceId(); // 作废实例id sysSalesOrder.setCancelInstanceId(processInstanceId); + sysSalesOrder.setInstanceId(processInstanceId); // 存在提交完就流程结束的情况 boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); if(processIsFinish){ @@ -284,6 +292,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService String processInstanceId = processInstance.getProcessInstanceId(); // 恢复实例id sysSalesOrder.setRestoreInstanceId(processInstanceId); + sysSalesOrder.setInstanceId(processInstanceId); // 存在提交完就流程结束的情况 boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); if(processIsFinish){ @@ -317,6 +326,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService String processInstanceId = processInstance.getProcessInstanceId(); // 提交实例id sysSalesOrder.setSubmitInstanceId(processInstanceId); + sysSalesOrder.setInstanceId(processInstanceId); // 存在提交完就流程结束的情况 boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); if(processIsFinish){ diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index 6643e75c..a96caab6 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -107,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) as p on s.instance_type = p.dict_value + and s.create_by = #{createBy} and s.sales_order_code like concat('%', #{salesOrderCode}, '%') and s.sales_order_number like concat('%', #{salesOrderNumber}, '%') and s.enterprise_code like concat('%', #{enterpriseCode}, '%') @@ -125,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.apply_time = #{applyTime} and s.apply_title = #{applyTitle} + order by s.apply_time desc - + +
- - - - + + + +
- - - - + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index a9f541df..d8c635ec 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -647,42 +647,64 @@ }); //计算 function getTotalAmount(){ - let getData = $("#bootstrap-sub-table-editOrder").bootstrapTable('getData'); + // $("#addFinishbomTable").bootstrapTable('refresh'); + let getData = $("#bootstrap-sub-table-order").bootstrapTable('getData'); let enterprise = 0;let enterpriseSum = 0; let noRmb = 0; - let rmb = 0;let noRmbSum = 0;let rmbSum = 0;let noUsd = 0; - let usd = 0;let noUsdSum = 0; let usdSum = 0; - $("#enterprise_edit").val(0); - $("#enterpriseSum_edit").val(0); - $("#noRmb_edit").val(0); - $("#rmb_edit").val(0); - $("#noRmbSum_edit").val(0); - $("#rmbTax_edit").val(0); - $("#noUsd_edit").val(0); - $("#usd_edit").val(0); - $("#noUsdSum_edit").val(0); + let rmb = 0;let noRmbSum =0;let rmbSum = 0; + let noUsd = 0;let usd = 0;let noUsdSum =0; let usdSum = 0; + $("input[name='materialSum']").val(0); + $("input[name='enterpriseSum']").val(0); + $("input[name='noRmbPrice']").val(0); + $("input[name='noRmbSum']").val(0); + $("input[name='rmbPrice']").val(0); + $("input[name='rmbTaxSum']").val(0); + $("input[name='noUsdPrice']").val(0); + $("input[name='noUsdSum']").val(0); + $("input[name='usdPrice']").val(0); + $("input[name='usdTaxSum']").val(0); for(let i=0;i