From 6c60884dba53060a9873f456a2b430b200647018 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Sat, 13 Jul 2024 22:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E6=B7=BB=E5=8A=A0=E8=AF=B7?= =?UTF-8?q?=E8=B4=AD=E5=8D=95=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=B7=B2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AF=B7=E8=B4=AD=E5=8D=95=E7=BB=8F=E7=90=86=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=EF=BC=8C=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=A0=B8=EF=BC=8C?= =?UTF-8?q?=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=82=E5=B7=B2=E9=80=9A=E8=BF=87=E8=AF=B7=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8=EF=BC=8C=E4=B8=BB?= =?UTF-8?q?=E7=AE=A1=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=89=AF=E6=80=BB=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=A0=B8=E3=80=82=E4=BF=AE=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E5=AF=B9=E8=B1=A1=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=98=E9=87=8Fsurpass=20=E9=87=91=E9=A2=9D=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E3000=20=E8=8A=82=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BizTodoItemServiceImpl.java | 7 +- ...aseRequisitioningOrderChildController.java | 24 +- .../BaseRequisitioningOrderController.java | 19 +- .../domain/BaseRequisitioningOrder.java | 17 +- .../domain/BaseRequisitioningOrderChild.java | 61 ++++- .../BaseRequisitioningOrderChildMapper.java | 32 ++- .../mapper/BaseRequisitioningOrderMapper.java | 44 +++- .../IBaseRequisitioningOrderChildService.java | 18 +- .../IBaseRequisitioningOrderService.java | 2 + ...seRequisitioningOrderChildServiceImpl.java | 20 +- .../BaseRequisitioningOrderServiceImpl.java | 121 ++++++--- .../BaseRequisitioningOrderChildMapper.xml | 95 ++++--- .../system/BaseRequisitioningOrderMapper.xml | 176 +++++++------ .../system/requesitioningChild/add.html | 10 +- .../system/requesitioningChild/edit.html | 10 +- .../requesitioningChild.html | 16 +- .../templates/system/requisitioning/add.html | 56 +++-- .../system/requisitioning/detail.html | 18 +- .../templates/system/requisitioning/edit.html | 27 +- .../system/requisitioning/requisitioning.html | 64 ++++- .../system/requisitioning/taksFzjlVerify.html | 40 --- .../system/requisitioning/taskFzjlVerify.html | 180 +++++++++++++ .../requisitioning/taskModifyApply.html | 237 +++++++++++++++++- .../system/requisitioning/taskQgjlVerify.html | 106 ++++++-- .../system/requisitioning/taskQgzgVerify.html | 171 +++++++++++-- .../system/requisitioning/taskZozjVerify.html | 234 +++++++++++++++-- 26 files changed, 1457 insertions(+), 348 deletions(-) delete mode 100644 ruoyi-admin/src/main/resources/templates/system/requisitioning/taksFzjlVerify.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/requisitioning/taskFzjlVerify.html diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java index 1ac55b97..f9132042 100644 --- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java +++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/service/impl/BizTodoItemServiceImpl.java @@ -183,6 +183,7 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService { } else { // 查询候选用户组，系统用户角色视图，group是角色 List todoUserIdList = bizTodoItemMapper.selectTodoUserListByTaskId(task.getId()); + //如果是查询初始化的 if (!CollectionUtils.isEmpty(todoUserIdList)) { for (String todoUserId: todoUserIdList) { SysUser todoUser = userMapper.selectUserByLoginName(todoUserId); @@ -206,6 +207,8 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService { } @Override public int insertTodoItem2(String instanceId, String itemName, String itemContent, String module) { + //获取当前请购人的部分信息，需要获取到的为当前节点,申请人，采购员，采购经理 + //查询待办项目 BizTodoItem todoItem = new BizTodoItem(); todoItem.setItemName(itemName); todoItem.setItemContent(itemContent); @@ -286,17 +289,16 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService { List taskList = taskService.createTaskQuery().processInstanceId(instanceId).active().list(); int counter = 0; for (Task task: taskList) { - // todoitem 去重 List bizTodoItem = bizTodoItemMapper.selectTodoItemByTaskId(task.getId(),"0"); if (bizTodoItem != null) continue; - BizTodoItem newItem = new BizTodoItem(); BeanUtils.copyProperties(todoItem, newItem); newItem.setInstanceId(instanceId); newItem.setTaskId(task.getId()); newItem.setTaskName("task" + task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1)); newItem.setNodeName(task.getName()); + //如果获取代理人 String assignee = task.getAssignee(); if (StringUtils.isNotBlank(assignee)) { newItem.setTodoUserId(assignee); @@ -307,7 +309,6 @@ public class BizTodoItemServiceImpl implements IBizTodoItemService { } else { List todoUserIdList = processMapper.selectTodoUserListByTaskId(task.getId()); System.out.println("todoUserIdList="+todoUserIdList); - for (String todoUserId: todoUserIdList) { SysUser todoUser = userMapper.selectUserByLoginName(todoUserId); newItem.setTodoUserId(todoUser.getLoginName()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderChildController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderChildController.java index bc1868b9..08cba919 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderChildController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderChildController.java @@ -26,25 +26,25 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2024-05-13 */ @Controller -@RequestMapping("/system/requesitioningChild") +@RequestMapping("/system/requisitioningChild") public class BaseRequisitioningOrderChildController extends BaseController { - private String prefix = "system/requesitioningChild"; + private String prefix = "system/requisitioningChild"; @Autowired private IBaseRequisitioningOrderChildService baseRequisitioningOrderChildService; -// @RequiresPermissions("system:requesitioningChild:view") +// @RequiresPermissions("system:requisitioningChild:view") @GetMapping() - public String requesitioningChild() + public String requisitioningChild() { - return prefix + "/requesitioningChild"; + return prefix + "/requisitioningChild"; } /** * 查询请购单列表 */ - @RequiresPermissions("system:requesitioningChild:list") +// @RequiresPermissions("system:requisitioningChild:list") @PostMapping("/list") @ResponseBody public TableDataInfo list(BaseRequisitioningOrderChild baseRequisitioningOrderChild) @@ -57,7 +57,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 导出请购单列表 */ -// @RequiresPermissions("system:requesitioningChild:export") +// @RequiresPermissions("system:requisitioninggChild:export") @Log(title = "请购单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody @@ -80,7 +80,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 新增保存请购单 */ -// @RequiresPermissions("system:requesitioningChild:add") +// @RequiresPermissions("system:requisitioninggChild:add") @Log(title = "请购单", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody @@ -103,7 +103,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 修改保存请购单 */ -// @RequiresPermissions("system:requesitioningChild:edit") +// @RequiresPermissions("system:requisitioningChild:edit") @Log(title = "请购单", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody @@ -115,7 +115,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 删除请购单 */ -// @RequiresPermissions("system:requesitioningChild:remove") +// @RequiresPermissions("system:requisitioningChild:remove") @Log(title = "请购单", businessType = BusinessType.DELETE) @PostMapping( "/remove") @ResponseBody @@ -127,7 +127,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 作废请购单 */ -// @RequiresPermissions("system:requesitioningChild:cancel") +// @RequiresPermissions("system:requisitioningChild:cancel") @Log(title = "请购单", businessType = BusinessType.CANCEL) @GetMapping( "/cancel/{id}") @ResponseBody @@ -138,7 +138,7 @@ public class BaseRequisitioningOrderChildController extends BaseController /** * 恢复请购单 */ -// @RequiresPermissions("system:requesitioningChild:restore") +// @RequiresPermissions("system:requisitioningChild:restore") @Log(title = "请购单", businessType = BusinessType.RESTORE) @GetMapping( "/restore/{id}") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderController.java index a419e72f..05c1fe90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseRequisitioningOrderController.java @@ -7,6 +7,7 @@ import java.util.Set; import java.util.stream.Collectors; import com.alibaba.fastjson.JSON; +import com.ruoyi.ck.utils.Result; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.base.BaseException; @@ -147,7 +148,10 @@ public class BaseRequisitioningOrderController extends BaseController @ResponseBody public AjaxResult addSave(@RequestBody BaseRequisitioningOrder baseRequisitioningOrder) { - baseRequisitioningOrderService.insertBaseRequisitioningOrder(baseRequisitioningOrder); + baseRequisitioningOrder.setCreateBy(ShiroUtils.getLoginName()); + baseRequisitioningOrder.setUseStatus("0"); + baseRequisitioningOrder.setAuditStatus("0"); + baseRequisitioningOrderService.submitApply(baseRequisitioningOrder); return AjaxResult.success(); } @@ -171,7 +175,11 @@ public class BaseRequisitioningOrderController extends BaseController @ResponseBody public AjaxResult editSave(@RequestBody BaseRequisitioningOrder baseRequisitioningOrder) { - return toAjax(baseRequisitioningOrderService.updateBaseRequisitioningOrder(baseRequisitioningOrder)); + baseRequisitioningOrder.setCreateBy(ShiroUtils.getLoginName()); + baseRequisitioningOrder.setUseStatus("0"); + baseRequisitioningOrder.setAuditStatus("0"); + baseRequisitioningOrderService.submitApply(baseRequisitioningOrder); + return AjaxResult.success(); } /** @@ -220,7 +228,7 @@ public class BaseRequisitioningOrderController extends BaseController SysDept dept = sysDeptMapper.selectDeptById(curUser.getDeptId()); String postName = ""; String deptName = ""; - if(sysPostList.size() <= 0){ + if(sysPostList.size() == 0){ deptName = dept.getDeptName(); }else{ postName = sysPostList.get(0).getPostName(); @@ -317,4 +325,9 @@ public class BaseRequisitioningOrderController extends BaseController return success("任务已完成"); } + @GetMapping("/getId") + @ResponseBody + public Result getId(HttpServletRequest request) throws Exception { + return Result.getSuccessResult(baseRequisitioningOrderService.getId()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrder.java index dc5bea5a..420e36e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrder.java @@ -42,7 +42,7 @@ public class BaseRequisitioningOrder extends BaseEntity /** 物料合计 */ @Excel(name = "物料合计") - private Long materialAmount; + private Integer materialAmount; /** 数量总计 */ @Excel(name = "数量总计") @@ -87,12 +87,23 @@ public class BaseRequisitioningOrder extends BaseEntity /** 申请人 */ private String applyTitle; + private String delFlag; + /** 申请时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyTime; private List baseRequisitioningOrderChildList; + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getInstanceId() { return instanceId; } @@ -227,12 +238,12 @@ public class BaseRequisitioningOrder extends BaseEntity { return correlationCode; } - public void setMaterialAmount(Long materialAmount) + public void setMaterialAmount(Integer materialAmount) { this.materialAmount = materialAmount; } - public Long getMaterialAmount() + public Integer getMaterialAmount() { return materialAmount; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrderChild.java index 6aa946a9..3314b8a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrderChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseRequisitioningOrderChild.java @@ -22,7 +22,7 @@ public class BaseRequisitioningOrderChild extends BaseEntity /** 关联请购单编号字段 */ @Excel(name = "关联请购单编号字段") - private String quoteId; + private String requisitioningCode; /** 物料表中的id */ @Excel(name = "物料表中的id") @@ -56,10 +56,17 @@ public class BaseRequisitioningOrderChild extends BaseEntity @Excel(name = "物料的品牌") private String brand; + /** 物料的单位 */ + @Excel(name = "物料的单位") + private String unit; + /** 物料的描述 */ @Excel(name = "物料的描述") private String describe; + @Excel(name = "入库部门") + private String warehouseDept; + /** 物料的数量 */ @Excel(name = "物料的数量") private Long materialNum; @@ -88,7 +95,18 @@ public class BaseRequisitioningOrderChild extends BaseEntity @Excel(name = "审核状态") private String auditStatus; - public void setRequisitioningChildId(Long requisitioningChildId) + private String delFlag; + + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public void setRequisitioningChildId(Long requisitioningChildId) { this.requisitioningChildId = requisitioningChildId; } @@ -97,16 +115,16 @@ public class BaseRequisitioningOrderChild extends BaseEntity { return requisitioningChildId; } - public void setQuoteId(String quoteId) - { - this.quoteId = quoteId; + + public String getRequisitioningCode() { + return requisitioningCode; } - public String getQuoteId() - { - return quoteId; + public void setRequisitioningCode(String requisitioningCode) { + this.requisitioningCode = requisitioningCode; } - public void setMaterialId(Long materialId) + + public void setMaterialId(Long materialId) { this.materialId = materialId; } @@ -187,12 +205,29 @@ public class BaseRequisitioningOrderChild extends BaseEntity { return describe; } - public void setMaterialNum(Long materialNum) + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public void setMaterialNum(Long materialNum) { this.materialNum = materialNum; } - public Long getMaterialNum() + public String getWarehouseDept() { + return warehouseDept; + } + + public void setWarehouseDept(String warehouseDept) { + this.warehouseDept = warehouseDept; + } + + public Long getMaterialNum() { return materialNum; } @@ -255,7 +290,7 @@ public class BaseRequisitioningOrderChild extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("requisitioningChildId", getRequisitioningChildId()) - .append("quoteId", getQuoteId()) + .append("requisitioningCode", getRequisitioningCode()) .append("materialId", getMaterialId()) .append("materialCode", getMaterialCode()) .append("photoUrl", getPhotoUrl()) @@ -264,6 +299,8 @@ public class BaseRequisitioningOrderChild extends BaseEntity .append("materialModel", getMaterialModel()) .append("specifications", getSpecifications()) .append("brand", getBrand()) + .append("unit", getUnit()) + .append("warehouseDept", getWarehouseDept()) .append("describe", getDescribe()) .append("materialNum", getMaterialNum()) .append("materialRmb", getMaterialRmb()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java index fdb2611b..d3e952ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java @@ -75,8 +75,36 @@ public interface BaseRequisitioningOrderChildMapper */ public int restoreBaseRequisitioningOrderChildById(Long requisitioningChildId); + /** + * 根据请购单号删除请购单 + * @param requisitioningCode 请购单号 + * @return + */ + public int deleteBaseRequisitioningOrderChildByRequisitioningCode(String requisitioningCode); + + /** + * 根据请购单号批量删除请购单 + * @param requisitioningCodes 请购单号组 + * @return + */ + + public int deleteBaseRequisitioningOrderChildByRequisitioningCodes(String[] requisitioningCodes); - public int deleteBaseRequisitioningOrderChildByQuoteId(String quoteId); + /** + * 根据请购单号批量修改请购单是否删除 + * @param delFlag 0 未删除 1 已删除 + * @param requisitioningCodes 请购单号组 + * @return + */ + + public int updateBaseRequisitioningOrderChildByRequisitioningCodes(String delFlag,String[] requisitioningCodes); + + /** + * 根据请购单号修改请购单是否删除 + * @param delFlag 0 未删除 1 已删除 + * @param requisitioningCode 请购单号 + * @return + */ - public int deleteBaseRequisitioningOrderChildByQuoteIds(String[] quoteIds); + public int updateBaseRequisitioningOrderChildByRequisitioningCode(String delFlag,String requisitioningCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderMapper.java index 20981bf3..26692b12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.BaseRequisitioningOrder; import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo; +import io.swagger.models.auth.In; /** * 请购单Mapper接口 @@ -76,9 +77,46 @@ public interface BaseRequisitioningOrderMapper * @param requisitioningId 请购单ID * @return 结果 */ - public int restoreBaseRequisitioningOrderById(Long requisitioningId); + public Integer restoreBaseRequisitioningOrderById(Long requisitioningId); - int deleteBaseRequisitioningOrderByCode(String requisitioningCode); + /** + * 根据编码删除请购单 + * @param requisitioningCode + * @return + */ + Integer deleteBaseRequisitioningOrderByCode(String requisitioningCode); - List selectBaseRequisitioningOrderByIds(String[] ids); + /** + * 根据编码批量删除请购单 + * @param requisitioningCodes + * @return + */ + + Integer deleteBaseRequisitioningOrderByCodes(String[] requisitioningCodes); + + /** + * 根据编码批量修改请购单 + * @param delFlag 0 未删除 1 已删除 + * @param requisitioningCodes + * @return + */ + + Integer updateBaseRequisitioningOrderByCodes(String delFlag,String[] requisitioningCodes); + + /** + * 根据编码修改请购单 + * @param delFlag + * @param requisitioningCode + * @return + */ + + Integer updateBaseRequisitioningOrderByCode(String delFlag,String requisitioningCode); + + /** + * 根据id批量查询请购单 + * @param ids + * @return + */ + + List selectBaseRequisitioningOrderByIds(String[] ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderChildService.java index 130cebc9..8463ecae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderChildService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderChildService.java @@ -9,7 +9,7 @@ import com.ruoyi.system.domain.BaseRequisitioningOrderChild; * @author zhang * @date 2024-05-13 */ -public interface IBaseRequisitioningOrderChildService +public interface IBaseRequisitioningOrderChildService { /** * 查询请购单 @@ -33,7 +33,7 @@ public interface IBaseRequisitioningOrderChildService * @param baseRequisitioningOrderChild 请购单 * @return 结果 */ - public int insertBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild); + public Integer insertBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild); /** * 修改请购单 @@ -41,7 +41,7 @@ public interface IBaseRequisitioningOrderChildService * @param baseRequisitioningOrderChild 请购单 * @return 结果 */ - public int updateBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild); + public Integer updateBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild); /** * 批量删除请购单 @@ -49,7 +49,7 @@ public interface IBaseRequisitioningOrderChildService * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteBaseRequisitioningOrderChildByIds(String ids); + public Integer deleteBaseRequisitioningOrderChildByIds(String ids); /** * 删除请购单信息 @@ -57,23 +57,23 @@ public interface IBaseRequisitioningOrderChildService * @param requisitioningChildId 请购单ID * @return 结果 */ - public int deleteBaseRequisitioningOrderChildById(Long requisitioningChildId); + public Integer deleteBaseRequisitioningOrderChildById(Long requisitioningChildId); /** * 作废请购单 * @param requisitioningChildId 请购单ID * @return */ - int cancelBaseRequisitioningOrderChildById(Long requisitioningChildId); + Integer cancelBaseRequisitioningOrderChildById(Long requisitioningChildId); /** * 恢复请购单 * @param requisitioningChildId 请购单ID * @return */ - int restoreBaseRequisitioningOrderChildById(Long requisitioningChildId); + Integer restoreBaseRequisitioningOrderChildById(Long requisitioningChildId); - int deleteBaseRequisitioningOrderChildByQuoteId(String quoteId); + Integer deleteBaseRequisitioningOrderChildByRequisitioningCode(String requisitioningCode); - int deleteBaseRequisitioningOrderChildByQuoteIds(String quoteIds); + Integer deleteBaseRequisitioningOrderChildByRequisitioningCodes(String requisitioningCodes); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java index c15199ab..4ad4ea74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java @@ -95,4 +95,6 @@ public interface IBaseRequisitioningOrderService * 提交申请*/ public ProcessInstance submitApply(BaseRequisitioningOrder baseRequisitioningOrder); + + Object getRequisitioningOrder(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderChildServiceImpl.java index e537d41e..ea607c00 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderChildServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderChildServiceImpl.java @@ -53,7 +53,7 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int insertBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild) + public Integer insertBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild) { String loginName = ShiroUtils.getLoginName(); baseRequisitioningOrderChild.setCreateBy(loginName); @@ -68,7 +68,7 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int updateBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild) + public Integer updateBaseRequisitioningOrderChild(BaseRequisitioningOrderChild baseRequisitioningOrderChild) { String loginName = ShiroUtils.getLoginName(); baseRequisitioningOrderChild.setUpdateBy(loginName); @@ -83,7 +83,7 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int deleteBaseRequisitioningOrderChildByIds(String ids) + public Integer deleteBaseRequisitioningOrderChildByIds(String ids) { return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByIds(Convert.toStrArray(ids)); } @@ -95,7 +95,7 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int deleteBaseRequisitioningOrderChildById(Long requisitioningChildId) + public Integer deleteBaseRequisitioningOrderChildById(Long requisitioningChildId) { return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildById(requisitioningChildId); } @@ -107,7 +107,7 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int cancelBaseRequisitioningOrderChildById(Long requisitioningChildId) + public Integer cancelBaseRequisitioningOrderChildById(Long requisitioningChildId) { return baseRequisitioningOrderChildMapper.cancelBaseRequisitioningOrderChildById(requisitioningChildId); } @@ -119,17 +119,17 @@ public class BaseRequisitioningOrderChildServiceImpl implements IBaseRequisition * @return 结果 */ @Override - public int restoreBaseRequisitioningOrderChildById(Long requisitioningChildId) + public Integer restoreBaseRequisitioningOrderChildById(Long requisitioningChildId) { return baseRequisitioningOrderChildMapper.restoreBaseRequisitioningOrderChildById(requisitioningChildId); } @Override - public int deleteBaseRequisitioningOrderChildByQuoteId(String quoteId) { - return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByQuoteId(quoteId); + public Integer deleteBaseRequisitioningOrderChildByRequisitioningCode(String requisitioningCode) { + return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByRequisitioningCode(requisitioningCode); } @Override - public int deleteBaseRequisitioningOrderChildByQuoteIds(String quoteIds) { - return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByQuoteIds(Convert.toStrArray(quoteIds)); + public Integer deleteBaseRequisitioningOrderChildByRequisitioningCodes(String requisitioningCodes) { + return baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByRequisitioningCodes(Convert.toStrArray(requisitioningCodes)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java index c49c1a21..bd56ba1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java @@ -38,6 +38,7 @@ import com.ruoyi.system.service.IBaseRequisitioningOrderService; import com.ruoyi.common.core.text.Convert; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * 请购单Service业务层处理 @@ -57,6 +58,7 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr @Autowired private RedisCache redisCache; + @Autowired private ISysRoleService roleService; @Autowired @@ -180,23 +182,30 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr for (BaseRequisitioningOrderChild child : childList) { //物料数量 materialSum += child.getMaterialNum(); + if (child.getMaterialRmbSum() == null){ + child.setMaterialRmbSum(new BigDecimal(0)); + } + if (child.getMaterialNoRmbSum() == null){ + child.setMaterialNoRmbSum(new BigDecimal(0)); + } //物料不含税总价(RMB) materialRmbSum = child.getMaterialRmbSum().setScale(2, RoundingMode.HALF_UP).add(materialNoRmbSum); //物料含税总价(RMB) materialNoRmbSum = child.getMaterialNoRmbSum().setScale(2, RoundingMode.HALF_UP).add(materialNoRmbSum); - child.setQuoteId(baseRequisitioningOrder.getRequisitioningCode()); + child.setRequisitioningCode(baseRequisitioningOrder.getRequisitioningCode()); child.setCreateBy(loginName); child.setCreateTime(DateUtils.getNowDate()); baseRequisitioningOrderChildMapper.insertBaseRequisitioningOrderChild(child); } } - baseRequisitioningOrder.setAuditStatus("1"); - baseRequisitioningOrder.setUseStatus("1"); - baseRequisitioningOrder.setMaterialAmount(Long.valueOf(childSize)); + baseRequisitioningOrder.setMaterialAmount(childSize); baseRequisitioningOrder.setMaterialSum(materialSum); baseRequisitioningOrder.setRmbSum(materialRmbSum); baseRequisitioningOrder.setNoRmbSum(materialNoRmbSum); - return baseRequisitioningOrderMapper.insertBaseRequisitioningOrder(baseRequisitioningOrder); + int result = baseRequisitioningOrderMapper.insertBaseRequisitioningOrder(baseRequisitioningOrder); + //如要获取请购单ID，作为key + baseRequisitioningOrder.getRequisitioningId(); + return result; } /** @@ -213,18 +222,21 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr baseRequisitioningOrder.setUpdateBy(loginName); baseRequisitioningOrder.setUpdateTime(DateUtils.getNowDate()); String requisitioningCode = baseRequisitioningOrder.getRequisitioningCode(); - baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByQuoteId(baseRequisitioningOrder.getRequisitioningCode()); List childList = baseRequisitioningOrder.getBaseRequisitioningOrderChildList(); Long materialSum = 0L; BigDecimal materialRmbSum = new BigDecimal(0); BigDecimal materialNoRmbSum = new BigDecimal(0); - int childSize = childList.size(); + if(ObjectUtils.isEmpty(childList)) { + return 0; + } + Integer childSize = childList.size(); if (childSize > 0) { + baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByRequisitioningCode(baseRequisitioningOrder.getRequisitioningCode()); for (BaseRequisitioningOrderChild child: childList) { materialSum += child.getMaterialNum(); materialRmbSum = child.getMaterialRmbSum().setScale(2, RoundingMode.HALF_UP).add(materialNoRmbSum); materialNoRmbSum = child.getMaterialNoRmbSum().setScale(2, RoundingMode.HALF_UP).add(materialNoRmbSum); - child.setQuoteId(requisitioningCode); + child.setRequisitioningCode(requisitioningCode); child.setCreateBy(loginName); child.setCreateTime(DateUtils.getNowDate()); child.setUpdateBy(loginName); @@ -232,9 +244,7 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr baseRequisitioningOrderChildMapper.insertBaseRequisitioningOrderChild(child); } } - baseRequisitioningOrder.setAuditStatus("1"); - baseRequisitioningOrder.setUseStatus("1"); - baseRequisitioningOrder.setMaterialAmount(Long.valueOf(childSize)); + baseRequisitioningOrder.setMaterialAmount(childSize); baseRequisitioningOrder.setMaterialSum(materialSum); baseRequisitioningOrder.setRmbSum(materialRmbSum); baseRequisitioningOrder.setNoRmbSum(materialNoRmbSum); @@ -291,7 +301,7 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr @Override public int deleteBaseRequisitioningOrderByCode(String requisitioningCode) { - baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByQuoteId(requisitioningCode); + baseRequisitioningOrderChildMapper.deleteBaseRequisitioningOrderChildByRequisitioningCode(requisitioningCode); return baseRequisitioningOrderMapper.deleteBaseRequisitioningOrderByCode(requisitioningCode); } @Override @@ -393,12 +403,34 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr return processInstance; } + @Override + public Object getRequisitioningOrder() { + return redisCache.generateBillNo("QG"); + } + private ProcessInstance startProcessInstance(String applyTitle,String instanceType,BaseRequisitioningOrder baseRequisitioningOrder, SysUser user) { Long nessKey = baseRequisitioningOrder.getRequisitioningId(); - String businessKey = String.valueOf(nessKey); // 实体类 ID，作为流程的业务 key - String key = "requsition"; + String businessKey = String.valueOf(nessKey);; // 实体类 ID，作为流程的业务 key + String key = "requisitioning"; Map variables = new HashMap<>(); + BigDecimal rmbSum = baseRequisitioningOrder.getRmbSum(); + BigDecimal surpassPrice = new BigDecimal(3000.00); + int result = rmbSum.compareTo(surpassPrice); + Boolean surpass = false; + if (result > 0) { + surpass = true; + // rmbSum 大于 surpassPrice + variables.put("surpass",surpass); + } else if (result < 0) { + surpass = true; + // rmbSum 小于 surpassPrice + variables.put("surpass",surpass); + } else { + surpass = false; + // rmbSum 等于 surpassPrice + variables.put("surpass",surpass); + } // 构造authority传参 buildAuthority(user, variables); baseRequisitioningOrder.setApplyTitle(applyTitle); @@ -411,22 +443,53 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr } private void buildAuthority(SysUser user, Map variables) { + System.out.println("请购单启动流程"); + System.out.println("user = " + user + ", variables = " + variables); + + //查询当前请购人的角色 Set roleKeys = roleService.selectRoleKeys(user.getUserId()); - if(roleKeys.contains("zg")){ - // 超级管理员 - variables.put("authority",1); - } - if(roleKeys.contains("cg")){ - if(roleKeys.contains("cg_zj")){ - // 采购主管 - variables.put("authority",2); - }else{ - // 采购员 - variables.put("authority",3); - } + + variables.put("authority",1); + //判断请购人的角色，进入相应的逻辑，设置节点审批人变量 + if(roleKeys.contains("ywyRole") || roleKeys.contains("ywjlRole") || roleKeys.contains("ywzgRole")){ + // 业务经理 + variables.put("qgjlRole","ywjlRole"); + // 业务主管 + variables.put("qgzgRole","ywzgRole"); + }else if(roleKeys.contains("cgyRole") || roleKeys.contains("cgjlRole") || roleKeys.contains("cgzgRole")){ + // 采购经理 + variables.put("qgjlRole","cgjlRole"); + // 采购主管 + variables.put("qgzgRole","cgzgRole"); + }else if (roleKeys.contains("gcwyRole") || roleKeys.contains("gcjlRole") || roleKeys.contains("gczgRole")){ + // 工程经理 + variables.put("qgjlRole","gcjlRole"); + // 工程主管 + variables.put("qgzgRole","gczgRole"); + } else if (roleKeys.contains("scyRole") || roleKeys.contains("scjlRole") || roleKeys.contains("sczgRole")){ + // 生产经理 + variables.put("qgjlRole","scjlRoe"); + // 生产主管 + variables.put("qgzgRole","sczgRole"); + }else if (roleKeys.contains("shgcsRole") || roleKeys.contains("shjlRole") || roleKeys.contains("shzgRole")){ + // 售后经理 + variables.put("qgjlRole","shjlRole"); + // 售后主管 + variables.put("qgzgRole","shzgRole"); + }else if(roleKeys.contains("cgyyRole") || roleKeys.contains("ckzgRole")){ + variables.put("qgjlRole","shzgRole"); + // 售后主管 + variables.put("qgzgRole","shzgRole"); + }else if (roleKeys.contains("cwRole") || roleKeys.contains("cwjlRole")){ + variables.put("qgjlRole","cwjlRole"); + // 售后主管 + variables.put("qgzgRole","cwJlRole"); + }else{ + variables.put("authority",2); } - // 角色不同审核人不同 - variables.put("authority",1); - variables.put("qgje",3000); + if(roleKeys.contains("admin") ){ + // 角色包含业务经理、采购经理、工程经理、生产经理 + variables.put("authority",2); } + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml index ef956d96..752eb9b0 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml @@ -6,42 +6,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - select requisitioning_child_id, quote_id, material_id, material_code, photoUrl, - material_name, material_type, material_model, specifications, brand, + select requisitioning_child_id, requisitioning_code, material_id, material_code, photoUrl, + material_name, material_type, material_model, specifications, brand,unit,warehouseDept, `describe`, materialNum, materialRmb, materialNoRmb, materialNoRmbSum, materialRmbSum, remark, - create_by, create_time, update_by, update_time, use_status, audit_status + create_by, create_time, update_by, update_time, use_status, audit_status,del_flag from base_requisitioning_order_child select r.requisitioning_id, r.requisitioning_status, r.requisitioning_code, - r.correlation_code, r.material_amount, r.materialSum, r.noRmbSum, r.rmbSum, - r.update_by, r.update_time, r.remark,r.instance_id, p.dict_value as instance_type_name, + r.correlation_code, r.material_amount, r.materialSum, r.noRmbSum, r.rmbSum,r.create_by, + r.create_time,r.update_by, r.update_time, r.remark,r.instance_id, p.dict_value as instance_type_name, r.instance_type,r.submit_instance_id, r.cancel_instance_id, r.restore_instance_id, r.apply_title, r.apply_user, r.apply_time,r.apply_user, - r.create_by, r.create_time, r.audit_status, r.use_status + r.create_by, r.create_time, r.audit_status, r.use_status,r.dept_name,r.post_name from base_requisitioning_order as r left join( select dict_value,dict_label from sys_dict_data where dict_type = 'processType' - ) as p - on r.instance_type = p.dict_value + ) as p on r.instance_type = p.dict_value + r.del_flag = '0' + and r.requisitioning_id = #{requisitioningId} and r.requisitioning_status = #{requisitioningStatus} and r.requisitioning_code = #{requisitioningCode} and r.audit_status = #{auditStatus} @@ -71,19 +73,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and r.create_time between #{params.beginCreateTime} and #{params.endCreateTime} - - and r.requisitioning_code in ( - select quote_id from base_requisitioning_order_child - - - and material_code = #{params,materialCode} - - - and material_name = #{params.materialName} - - - ) - + + + + + + + + + + + + + @@ -108,6 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialSum, noRmbSum, rmbSum, + create_by, + create_time, + update_by, + update_time, + dept_name, + post_name, instance_id, instance_type, submit_instance_id, @@ -116,10 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" apply_title, apply_user, apply_time, - use_status, audit_status, - create_by, - create_time, + use_status, + del_flag, remark, @@ -130,18 +137,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialSum}, #{noRmbSum}, #{rmbSum}, - #{instance_id}, - #{instance_type}, - #{submit_instance_id}, - #{cancel_instance_id}, - #{restore_instance_id}, - #{apply_title}, - #{apply_user}, - #{apply_time}, - #{use_status}, - #{audit_status}, #{createBy}, #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptName}, + #{postName}, + #{instanceId}, + #{instanceType}, + #{submitInstanceId}, + #{cancelInstanceId}, + #{restoreInstanceId}, + #{applyTitle}, + #{applyUser}, + #{applyTime}, + #{useStatus}, + #{auditStatus}, + #{delFlag}, #{remark}, @@ -156,19 +168,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialSum = #{materialSum}, noRmbSum = #{noRmbSum}, rmbSum = #{rmbSum}, - remark = #{remark}, - #{instanceId}, - #{instanceType}, - #{submitInstanceId}, - #{cancelInstanceId}, - #{restoreInstanceId}, - #{applyTitle}, - #{applyUser}, - #{applyTime}, - #{useStatus}, - #{auditStatus}, update_by = #{updateBy}, update_time = #{updateTime}, + create_by = #{createBy}, + create_time = #{createTime}, + dept_name = #{deptName}, + post_name = #{postName}, + instance_id = #{instanceId}, + instance_type = #{instanceType}, + submit_instance_id = #{submitInstanceId}, + cancel_instance_id = #{cancelInstanceId}, + restore_instance_id =#{restoreInstanceId}, + apply_title = #{applyTitle}, + apply_user = #{applyUser}, + apply_time = #{applyTime}, + use_status = #{useStatus}, + audit_status = #{auditStatus}, + remark = #{remark}, + del_flag = #{delFlag}, + where requisitioning_id = #{requisitioningId} @@ -176,7 +194,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from base_requisitioning_order where requisitioning_id = #{requisitioningId} - delete from base_requisitioning_order where requisitioning_id in @@ -184,8 +201,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from base_requisitioning_order where requisitioning_code = #{requisitioningId} + delete from base_requisitioning_order where requisitioning_code = #{requisitioningCode} + + delete from base_requisitioning_order where requisitioning_code in + + #{requisitioningCode} + + + + update base_requisitioning_order set del_flag = #{delFlag} where requisitioning_code = #{requisitioningCode} + + + update base_requisitioning_order set del_flag = #{delFlag} where requisitioning_code in + + #{requisitioningCode} + + update base_requisitioning_order set del_flag = '1' where requisitioning_id = #{requisitioningId} diff --git a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html index 98ec1bf5..4f149fae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html @@ -5,11 +5,11 @@
-
+
- +
@@ -128,14 +128,14 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/edit.html b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/edit.html index 47c8008c..92015cdc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/edit.html @@ -5,12 +5,12 @@
- +
- +
@@ -130,14 +130,14 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/requesitioningChild.html b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/requesitioningChild.html index 4c643985..e694d4e7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/requesitioningChild.html +++ b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/requesitioningChild.html @@ -54,10 +54,10 @@
@@ -68,11 +68,11 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html index e58aa7e5..b6f8d05e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html @@ -71,12 +71,7 @@ url: ctx + "system/requesitioningChild/list", pagination: false, sidePagination: "client", - queryParams: function(params) { - var temp = { - requisitioningCode: baseRequisitioningOrder.requisitioningCode, - }; - return temp; - }, + queryParams:queryParams, model: "物料报价信息", columns: [ {checkbox: true}, @@ -111,7 +106,7 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, + {title: '物料的数量', field: 'materialNum',align: 'center'}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, {title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, @@ -129,6 +124,15 @@ }; $.table.init(options); }); + function queryParams(params) { + var curParams = { + // 传递参数查询参数 + pageSize: params.limit, + pageNum: params.offset / params.limit + 1, + requisitioningCode: baseRequisitioningOrder.requisitioningCode + }; + return curParams; + } function doSubmit(index, layero,uniqueId){ console.log(uniqueId); var iframeWin = window[layero.find('iframe')[0]['name']]; diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html index 23ecb1a9..fb0adab9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html @@ -4,6 +4,7 @@ +
@@ -18,19 +19,19 @@
- +
- +
- +
@@ -59,27 +60,24 @@ + + + - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskFzjlVerify.html new file mode 100644 index 00000000..62135b3f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskFzjlVerify.html @@ -0,0 +1,180 @@ + + + + + + + +
+
+ + + + + + + +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ 选择报价信息 +
+
+
+
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskModifyApply.html index 6d2c95d5..35da6f87 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskModifyApply.html @@ -1,27 +1,257 @@ - + + +
+ + + + + + + + +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+ 选择报价信息 + + 添加物料 + +
+
+
+
+
+
+
+
+ + + diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgjlVerify.html index fc704dee..62b12cda 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgjlVerify.html @@ -12,8 +12,8 @@ + -
@@ -38,25 +38,25 @@
- +
- +
- +
@@ -65,14 +65,27 @@
+
+ +
+ +
+
+
+ +
+ +
+
选择报价信息 - - 添加物料 -
@@ -84,28 +97,81 @@
+ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgzgVerify.html index 992965f3..bf9e4681 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgzgVerify.html @@ -1,42 +1,177 @@ - +
- + + + + + + +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ 选择报价信息 +
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskZozjVerify.html index 4d7c83ca..cf6e20f7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/taskZozjVerify.html @@ -7,34 +7,236 @@
- + + + + + + + +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ 选择报价信息 +
+
+
+
+
+
+
+
+ \ No newline at end of file