From f7a3cd2eb48fe765a0c6cdced1bd36c3b29c7fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 25 Oct 2024 14:44:42 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=A0=BC=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=88=97=E5=B1=85=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=A1=8C=E6=A0=B7=E5=BC=8F=EF=BC=9B=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=90=88=E5=B9=B6=E6=93=8D=E4=BD=9C=E5=88=97?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=8A=A5=E6=8D=9F=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9Fvo?= =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0=EF=BC=9B=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=E5=8A=A0=E8=BD=BD=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=BC=B9=E7=AA=97=E3=80=81=E7=BB=91=E5=AE=9A=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AF=B9=E8=B1=A1=E3=80=81=E5=AE=8C=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1controller=E6=96=B9=E6=B3=95=EF=BC=9B=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=E3=80=81=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E3=80=81=E5=88=9B=E5=BB=BA=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E3=80=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=8F=98=E9=87=8Fservice=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E6=96=B0=E5=A2=9Eservice=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=96=B0=E5=A2=9E=E5=90=8E=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=8A=A5=E6=8D=9Fmapper=E5=AE=A1=E6=89=B9=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E6=8D=9F=E4=BB=93=E5=BA=93=E4=B8=BB?= =?UTF-8?q?=E7=AE=A1=E3=80=81=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ehouseInventoryReportDamageController.java | 138 +++++- .../VO/WarehouseInventoryReportDamageVo.java | 35 ++ .../VO/WarehouseInventoryReportDamegeVo.java | 102 ----- .../WarehouseInventoryReportDamage.java | 42 +- .../WarehouseInventoryReportDamageMapper.java | 14 +- ...WarehouseInventoryReportDamageService.java | 22 +- ...houseInventoryReportDamageServiceImpl.java | 231 ++++++++-- .../WarehouseInventoryReportDamageMapper.xml | 60 ++- .../warehouse/inventoryReportDamage/add.html | 32 +- .../inventoryReportDamage/detail.html | 75 ++- .../inventoryReportDamage.html | 126 +++++- .../inventoryReportDamage/taskCkzgVerify.html | 221 +++++++++ .../inventoryReportDamage/taskFzjlVerify.html | 221 +++++++++ .../taskModifyApply.html | 426 ++++++++++++++++++ 14 files changed, 1506 insertions(+), 239 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamageVo.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskCkzgVerify.html create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskFzjlVerify.html create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskModifyApply.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java index e30a176d..4d76c1c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java @@ -1,21 +1,30 @@ package com.ruoyi.warehouse.controller; +import java.util.HashMap; import java.util.List; +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.BusinessException; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.erp.domain.ErpMaterialVo; -import com.ruoyi.system.domain.SysMakeorderBom; -import com.ruoyi.system.domain.SysPost; +import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysMakeorderBomMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryReportDamageVo; import com.ruoyi.warehouse.domain.VO.WarehouseMaterialVO; +import com.ruoyi.warehouse.domain.WarehouseInventoryCheckDetail; import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageChildMapper; import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService; +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.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,6 +41,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** * 仓库库存报损Controller @@ -60,6 +70,15 @@ public class WarehouseInventoryReportDamageController extends BaseController @Autowired private WarehouseInventoryReportDamageChildMapper damageChildMapper; + @Autowired + private TaskService taskService; + + @Autowired + private RuntimeService runtimeService; + + @Autowired + private IProcessService processService; + @RequiresPermissions("warehouse:inventoryReportDamage:view") @GetMapping() public String inventoryReportDamage() @@ -73,10 +92,10 @@ public class WarehouseInventoryReportDamageController extends BaseController @RequiresPermissions("warehouse:inventoryReportDamage:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public TableDataInfo list(WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo) { startPage(); - List list = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageList(warehouseInventoryReportDamage); + List list = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageList(warehouseInventoryReportDamageVo); return getDataTable(list); } @@ -118,9 +137,104 @@ public class WarehouseInventoryReportDamageController extends BaseController @Log(title = "仓库库存报损", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@RequestBody WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public AjaxResult addSave(@RequestBody WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo) { - return toAjax(warehouseInventoryReportDamageService.insertWarehouseInventoryReportDamage(warehouseInventoryReportDamage)); + warehouseInventoryReportDamageVo.setAuditStatus("0"); + warehouseInventoryReportDamageService.submitApply(warehouseInventoryReportDamageVo); + return AjaxResult.success(); + } + + /** + * 加载审批弹窗 + * @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(); + WarehouseInventoryReportDamageVo reportDamegeVo = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageById(new Long(processInstance.getBusinessKey())); + mmap.put("formData", reportDamegeVo); + mmap.put("taskId", taskId); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + return prefix + "/task" + verifyName; + } + /** + * 自动绑定页面字段 + */ + @ModelAttribute("preloadObj") + public WarehouseInventoryReportDamageVo getObj(@RequestParam(value = "reportDamageId", required = false) Long reportDamageId, HttpSession session) { + if (reportDamageId != null) { + return warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageById(reportDamageId); + } + return new WarehouseInventoryReportDamageVo(); + } + /** + * 完成任务 + * + * @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, + @RequestParam(value = "inventoryReportDamageChildList", required = false) String inventoryReportDamageChildList, + @ModelAttribute("preloadObj") WarehouseInventoryReportDamageVo reportDamageVo, HttpServletRequest request) { + reportDamageVo.setWarehouseInventoryReportDamageChildList(JSON.parseArray(inventoryReportDamageChildList, WarehouseInventoryReportDamageChild.class)); + boolean saveEntityBoolean = BooleanUtils.toBoolean(saveEntity); + //获取实例id + String instanceId = reportDamageVo.getInstanceId(); + //获取实例类型 + String instanceType = reportDamageVo.getInstanceType(); + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); + if(verifyName.equals("ModifyApply")){ + //驳回调整，设置为待审核 + reportDamageVo.setAuditStatus("0"); + reportDamageVo.setApplyTime(DateUtils.getNowDate()); + } + boolean approvedFlag = processService.complete(taskId, instanceId, reportDamageVo.getApplyTitle(), reportDamageVo.getReportDamageCode(), + "reportDamage", new HashMap(), request); + if(!approvedFlag){ + // 审核状态-审核拒绝 + reportDamageVo.setAuditStatus("2"); + } + // 如果任务已结束更新业务表状态 + boolean processIsFinish = processService.judgeProcessIsFinish(instanceId); + if (processIsFinish) { + // 审核通过 + reportDamageVo.setAuditStatus("1"); + // 提交 + if("submit".equals(instanceType)){ + // 使用状态-是 + reportDamageVo.setUseStatus("1"); + WarehouseInventoryReportDamageVo reportDamageVoData = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageById(reportDamageVo.getReportDamageId()); + + List damageChildren = reportDamageVoData.getWarehouseInventoryReportDamageChildList(); + if(damageChildren!=null){ + for (WarehouseInventoryReportDamageChild child:damageChildren) { + warehouseInventoryReportDamageService.updateWarehouseInventoryInquiry(child); + } + } + } + // 作废 + else if("cancel".equals(instanceType)){ + // 使用状态-已作废 + reportDamageVo.setUseStatus("2"); + } + // 恢复 + else if("restore".equals(instanceType)){ + // 使用状态-是 + reportDamageVo.setUseStatus("1"); + } + } + warehouseInventoryReportDamageService.updateVerify(reportDamageVo); + // 驳回申请后继续申请，可能修改表单 + if (saveEntityBoolean) { + warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(reportDamageVo); + } + return success("任务已完成"); } /** @@ -141,9 +255,9 @@ public class WarehouseInventoryReportDamageController extends BaseController @Log(title = "仓库库存报损", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@RequestBody WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public AjaxResult editSave(@RequestBody WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo) { - return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage)); + return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamageVo)); } @@ -165,9 +279,9 @@ public class WarehouseInventoryReportDamageController extends BaseController @Log(title = "仓库库存报损", businessType = BusinessType.UPDATE) @PostMapping("/detail") @ResponseBody - public AjaxResult detailSave(WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public AjaxResult detailSave(WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo) { - return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage)); + return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamageVo)); } @GetMapping("/getUserDeptName") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamageVo.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamageVo.java new file mode 100644 index 00000000..dc1dbfab --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamageVo.java @@ -0,0 +1,35 @@ +package com.ruoyi.warehouse.domain.VO; + +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; +import lombok.Data; + +import java.util.Date; + +@Data +public class WarehouseInventoryReportDamageVo extends WarehouseInventoryReportDamage { + private static final long serialVersionUID = 1L; + /** 申请人姓名 */ + private String applyUserName; + /** 任务ID */ + private String taskId; + /** 任务名称 */ + private String taskName; + /** 当前状态 */ + private String taskStatus; + /** 办理时间 */ + private Date doneTime; + /** 创建人 */ + private String createUserName; + /** 流程实例状态 1 激活 2 挂起 */ + private String suspendState; + /** 待办用户id */ + private String todoUserId; + /** 流程实例类型名称 */ + private String instanceTypeName; + + /** + * 关键词 + */ + private String keyword; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java deleted file mode 100644 index 7b71b370..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.ruoyi.warehouse.domain.VO; - -import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; - -import java.util.Date; - -public class WarehouseInventoryReportDamegeVo extends WarehouseInventoryReportDamage { - private static final long serialVersionUID = 1L; - /** 申请人姓名 */ - 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; - - 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; - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java index 72e093f9..9742b786 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamage.java @@ -44,9 +44,6 @@ public class WarehouseInventoryReportDamage extends BaseEntity private String applyDept; /** 申请时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date applyTime; /** 料号 */ @Excel(name = "料号") @@ -76,6 +73,10 @@ public class WarehouseInventoryReportDamage extends BaseEntity @Excel(name = "仓库存放地址") private String warehouseStoreAddress; + private String auditStatus; + + private String useStatus; + /** 报废类型 */ private String scrapType; @@ -94,13 +95,20 @@ public class WarehouseInventoryReportDamage extends BaseEntity /** 恢复流程实例ID */ private String restoreInstanceId; - /** 申请人 */ + /** 申请标题 */ private String applyTitle; /** 申请人 */ @Excel(name = "申请人",sort = 10) private String applyUser; + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date applyTime; + + //作废理由 + private String cancelRemark; + private Long photoAttachId; private String fileIdStr; @@ -332,6 +340,32 @@ public class WarehouseInventoryReportDamage extends BaseEntity this.scrapType = scrapType; } + 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; + } + + @Override + public String getCancelRemark() { + return cancelRemark; + } + + @Override + public void setCancelRemark(String cancelRemark) { + this.cancelRemark = cancelRemark; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageMapper.java index 18c09294..56b267b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.warehouse.mapper; import java.util.List; + +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryReportDamageVo; import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,7 +22,7 @@ public interface WarehouseInventoryReportDamageMapper * @param reportDamageId 仓库库存报损ID * @return 仓库库存报损 */ - public WarehouseInventoryReportDamage selectWarehouseInventoryReportDamageById(Long reportDamageId); + public WarehouseInventoryReportDamageVo selectWarehouseInventoryReportDamageById(Long reportDamageId); /** * 查询仓库库存报损列表 @@ -28,23 +30,23 @@ public interface WarehouseInventoryReportDamageMapper * @param warehouseInventoryReportDamage 仓库库存报损 * @return 仓库库存报损集合 */ - public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage); /** * 新增仓库库存报损 * - * @param warehouseInventoryReportDamage 仓库库存报损 + * @param warehouseInventoryReportDamageVo 仓库库存报损 * @return 结果 */ - public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo); /** * 修改仓库库存报损 * - * @param warehouseInventoryReportDamage 仓库库存报损 + * @param warehouseInventoryReportDamageVo 仓库库存报损 * @return 结果 */ - public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamageVo); /** * 删除仓库库存报损 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageService.java index 121b980f..9346c44f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageService.java @@ -2,8 +2,12 @@ package com.ruoyi.warehouse.service; import java.util.List; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryReportDamageVo; import com.ruoyi.warehouse.domain.VO.WarehouseMaterialVO; import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; +import org.activiti.engine.runtime.ProcessInstance; +import org.springframework.transaction.annotation.Transactional; /** * 仓库库存报损Service接口 @@ -19,7 +23,7 @@ public interface IWarehouseInventoryReportDamageService * @param reportDamageId 仓库库存报损ID * @return 仓库库存报损 */ - public WarehouseInventoryReportDamage selectWarehouseInventoryReportDamageById(Long reportDamageId); + public WarehouseInventoryReportDamageVo selectWarehouseInventoryReportDamageById(Long reportDamageId); /** * 查询仓库库存报损列表 @@ -27,7 +31,7 @@ public interface IWarehouseInventoryReportDamageService * @param warehouseInventoryReportDamage 仓库库存报损 * @return 仓库库存报损集合 */ - public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage); /** * 新增仓库库存报损 @@ -35,7 +39,10 @@ public interface IWarehouseInventoryReportDamageService * @param warehouseInventoryReportDamage 仓库库存报损 * @return 结果 */ - public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamage); + + @Transactional(rollbackFor = Exception.class) + int updateWarehouseInventoryInquiry(WarehouseInventoryReportDamageChild damageChild); /** * 修改仓库库存报损 @@ -43,7 +50,14 @@ public interface IWarehouseInventoryReportDamageService * @param warehouseInventoryReportDamage 仓库库存报损 * @return 结果 */ - public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage); + public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamage); + + //修改审批后信息 + @Transactional + int updateVerify(WarehouseInventoryReportDamageVo reportDamegeVo); + + @Transactional(rollbackFor = Exception.class) + ProcessInstance submitApply(WarehouseInventoryReportDamageVo reportDamegeVo); /** * 批量删除仓库库存报损 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java index be4cc761..95b67f51 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java @@ -2,25 +2,35 @@ package com.ruoyi.warehouse.service.impl; import java.math.BigDecimal; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +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.exception.BusinessException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.erp.domain.ErpMaterialVo; +import com.ruoyi.process.general.service.IProcessService; +import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper; import com.ruoyi.system.domain.SysMakeorderBom; import com.ruoyi.system.mapper.SysMakeorderBomMapper; -import com.ruoyi.warehouse.controller.WarehouseInventoryReportDamageController; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.impl.SysRoleServiceImpl; import com.ruoyi.warehouse.domain.*; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryReportDamageVo; import com.ruoyi.warehouse.domain.VO.WarehouseMaterialVO; import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryDetailMapper; import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper; import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageChildMapper; import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageMapper; @@ -54,6 +64,24 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve @Autowired private WarehouseInventoryInquiryDetailMapper inventoryInquiryDetailMapper; + + @Autowired + private SysRoleServiceImpl roleService; + + @Autowired + private TaskService taskService; + + @Autowired + private RuntimeService runtimeService; + + @Autowired + private BizTodoItemMapper todoItemMapper; + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private IProcessService processService; /** * 查询仓库库存报损 * @@ -61,13 +89,17 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve * @return 仓库库存报损 */ @Override - public WarehouseInventoryReportDamage selectWarehouseInventoryReportDamageById(Long reportDamageId) + public WarehouseInventoryReportDamageVo selectWarehouseInventoryReportDamageById(Long reportDamageId) { - WarehouseInventoryReportDamage warehouseInventoryReportDamage = warehouseInventoryReportDamageMapper.selectWarehouseInventoryReportDamageById(reportDamageId); + WarehouseInventoryReportDamageVo warehouseInventoryReportDamage = warehouseInventoryReportDamageMapper.selectWarehouseInventoryReportDamageById(reportDamageId); List reportDamageChildList = damageChildMapper.selectWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode()); if(StringUtils.isNotEmpty(reportDamageChildList)){ warehouseInventoryReportDamage.setWarehouseInventoryReportDamageChildList(reportDamageChildList); } + SysUser applyUser = userMapper.selectUserByLoginName(warehouseInventoryReportDamage.getApplyUser()); + if(applyUser != null){ + warehouseInventoryReportDamage.setApplyUserName(applyUser.getUserName()); + } return warehouseInventoryReportDamage; } @@ -78,9 +110,68 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve * @return 仓库库存报损 */ @Override - public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public List selectWarehouseInventoryReportDamageList(WarehouseInventoryReportDamage warehouseInventoryReportDamage) { - return warehouseInventoryReportDamageMapper.selectWarehouseInventoryReportDamageList(warehouseInventoryReportDamage); + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + + // PageHelper 仅对第一个 List 分页 + Page list = (Page) warehouseInventoryReportDamageMapper.selectWarehouseInventoryReportDamageList(warehouseInventoryReportDamage); + Page returnList = new Page<>(); + for (WarehouseInventoryReportDamageVo reportDamageVo: list) { + SysUser sysUser = userMapper.selectUserByLoginName(reportDamageVo.getCreateBy()); + if (sysUser != null) { + reportDamageVo.setCreateUserName(sysUser.getUserName()); + } + SysUser sysUser2 = userMapper.selectUserByLoginName(reportDamageVo.getApplyUser()); + if (sysUser2 != null) { + reportDamageVo.setApplyUserName(sysUser2.getUserName()); + } + String instanceId = reportDamageVo.getInstanceId(); + // 当前环节 + if (StringUtils.isNotBlank(instanceId)) { + List taskList = taskService.createTaskQuery() + .processInstanceId(instanceId) +// .singleResult(); + .list(); // 例如请假会签，会同时拥有多个任务 + if (!org.springframework.util.CollectionUtils.isEmpty(taskList)) { + TaskEntityImpl task = (TaskEntityImpl) taskList.get(0); + String taskId = task.getId(); + reportDamageVo.setTaskId(taskId); + // 设置待办用户 + List todoUserList = todoItemMapper.selectUndealTodoUserList(taskId); + if(!org.springframework.util.CollectionUtils.isEmpty(taskList)){ + reportDamageVo.setTodoUserId(String.join(",",todoUserList)); + } + if (task.getSuspensionState() == 2) { + reportDamageVo.setTaskName("已挂起"); + reportDamageVo.setSuspendState("2"); + } else { + reportDamageVo.setTaskName(task.getName()); + reportDamageVo.setSuspendState("1"); + } + } else { + // 已办结或者已撤销 + reportDamageVo.setTaskName("已结束"); + } + } else { + reportDamageVo.setTaskName("未启动"); + } + reportDamageVo.setTaskStatus(reportDamageVo.getTaskName()); + if(reportDamageVo.getAuditStatus()==null){ + reportDamageVo.setTaskStatus("未启动"); + }else if(reportDamageVo.getAuditStatus().equals("1")){ + reportDamageVo.setTaskStatus("审核通过"); + }else if(reportDamageVo.getAuditStatus().equals("2")){ + reportDamageVo.setTaskStatus("审核拒绝"); + } + returnList.add(reportDamageVo); + } + returnList.setTotal(org.springframework.util.CollectionUtils.isEmpty(list) ? 0 : list.getTotal()); + returnList.setPageNum(pageNum); + returnList.setPageSize(pageSize); + return returnList; } /** @@ -91,7 +182,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve */ @Override @Transactional(rollbackFor = Exception.class) - public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamage) { //更改日期格式，以提高可读性 //移除日期中的分隔符以便于后续处理 @@ -108,26 +199,27 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve //报损子表数据 //判断子表数据是否为空 if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){ - for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()) { + for(WarehouseInventoryReportDamageChild reportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()) { +// 先验证库存查询记录是否为空，避免后续审核通过更新时为空影响流程 + WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(reportDamageChild.getMaterialNo()); + if(inventoryInquiry == null){ + throw new BusinessException("物料"+reportDamageChild.getMaterialNo()+"库存查询记录为空！请检查"); + } //子表数据不为空，则插入子表数据 - sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity()); - warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); - warehouseInventoryReportDamageChild.setReportDamageCode(newCode); + sumTotal = sumTotal.add(reportDamageChild.getActualScrapQuantity()); + reportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); + reportDamageChild.setReportDamageCode(newCode); if(warehouseInventoryReportDamage.getApplyTime()!=null){ - warehouseInventoryReportDamageChild.setScrapDate(warehouseInventoryReportDamage.getApplyTime()); - } - warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate()); - warehouseInventoryReportDamageChild.setCreateBy(loginName); - warehouseInventoryReportDamageChild.setWarehouseCode(warehouseInventoryReportDamage.getWarehouseCode()); - warehouseInventoryReportDamageChild.setWarehouseName(warehouseInventoryReportDamage.getWarehouseName()); - warehouseInventoryReportDamageChild.setWarehouseStoreAddress(warehouseInventoryReportDamage.getWarehouseStoreAddress()); - warehouseInventoryReportDamageChild.setApplyDeptId(String.valueOf(ShiroUtils.getSysUser().getDeptId())); - warehouseInventoryReportDamageChild.setApplyDept(ShiroUtils.getSysUser().getDept().getDeptName()); - warehouseInventoryReportDamageChildService.insertWarehouseInventoryReportDamageChild(warehouseInventoryReportDamageChild); - int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseInventoryReportDamageChild); - if(inquiryUpdateResult<=0){ - throw new BusinessException("更新库存查询失败！"); + reportDamageChild.setScrapDate(warehouseInventoryReportDamage.getApplyTime()); } + reportDamageChild.setCreateTime(DateUtils.getNowDate()); + reportDamageChild.setCreateBy(loginName); + reportDamageChild.setWarehouseCode(warehouseInventoryReportDamage.getWarehouseCode()); + reportDamageChild.setWarehouseName(warehouseInventoryReportDamage.getWarehouseName()); + reportDamageChild.setWarehouseStoreAddress(warehouseInventoryReportDamage.getWarehouseStoreAddress()); + reportDamageChild.setApplyDeptId(String.valueOf(ShiroUtils.getSysUser().getDeptId())); + reportDamageChild.setApplyDept(ShiroUtils.getSysUser().getDept().getDeptName()); + warehouseInventoryReportDamageChildService.insertWarehouseInventoryReportDamageChild(reportDamageChild); } }else{ //子表数据为空，则抛出异常 @@ -137,6 +229,8 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve return warehouseInventoryReportDamageMapper.insertWarehouseInventoryReportDamage(warehouseInventoryReportDamage); } + @Transactional(rollbackFor = Exception.class) + @Override public int updateWarehouseInventoryInquiry(WarehouseInventoryReportDamageChild damageChild){ WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(damageChild.getMaterialNo()); if(inventoryInquiry == null){ @@ -184,7 +278,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve * @return 结果 */ @Override - public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage) + public int updateWarehouseInventoryReportDamage(WarehouseInventoryReportDamageVo warehouseInventoryReportDamage) { String loginName = ShiroUtils.getLoginName(); warehouseInventoryReportDamage.setUpdateBy(loginName); @@ -219,6 +313,85 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve return warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage); } + //修改审批后信息 + @Transactional + @Override + public int updateVerify(WarehouseInventoryReportDamageVo reportDamegeVo){ + reportDamegeVo.setUpdateBy(ShiroUtils.getLoginName()); + reportDamegeVo.setUpdateTime(DateUtils.getNowDate()); + return warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(reportDamegeVo); + } + + /** + * 审批流程启动 + * */ + @Transactional(rollbackFor = Exception.class) + @Override + public ProcessInstance submitApply(WarehouseInventoryReportDamageVo reportDamegeVo) { + + SysUser user = ShiroUtils.getSysUser(); + reportDamegeVo.setApplyUser(user.getLoginName()); + reportDamegeVo.setApplyTime(DateUtils.getNowDate()); + // 保存 + insertWarehouseInventoryReportDamage(reportDamegeVo); + // 启动流程 + String applyTitle = user.getUserName()+"发起了库存报损提交审批-"+DateUtils.dateTimeNow(); + String instanceType = "submit"; + ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,reportDamegeVo, user); + String processInstanceId = processInstance.getProcessInstanceId(); + // 提交实例id + reportDamegeVo.setSubmitInstanceId(processInstanceId); + // 存在提交完就流程结束的情况 + boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); + if(processIsFinish){ + // 审核状态-审核通过 + reportDamegeVo.setAuditStatus("1"); + + reportDamegeVo.setUseStatus("1"); + } + warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(reportDamegeVo); + return processInstance; + } + + + /** + * 创建库存报损审核流程 + * @param applyTitle + * @param instanceType + * @param user + * @return + */ + private ProcessInstance startProcessInstance(String applyTitle, String instanceType, WarehouseInventoryReportDamageVo reportDamegeVo, SysUser user) { + Long reportDamageId = reportDamegeVo.getReportDamageId(); + String businessKey = reportDamageId.toString(); // 实体类 ID，作为流程的业务 key + String key = "reportDamage"; + Map variables = new HashMap<>(); + // 构造authority传参 + buildAuthority(user, variables); + reportDamegeVo.setApplyTitle(applyTitle); + // 启动流程 + ProcessInstance processInstance = processService.submitApply(user.getLoginName(), businessKey, applyTitle, reportDamegeVo.getReportDamageCode(), key, variables); + String processInstanceId = processInstance.getId(); + reportDamegeVo.setInstanceId(processInstanceId); // 建立双向关系 + reportDamegeVo.setInstanceType(instanceType); + return processInstance; + } + + /** + * 发起人节点判断 + * */ + private void buildAuthority(SysUser user, Map variables) { + Set roleKeys = roleService.selectRoleKeys(user.getUserId()); + // 角色不同审核人不同 + if(roleKeys.contains("cgyyRole")){ + variables.put("authority",1); + }else if(roleKeys.contains("ckzgRole")){ + variables.put("authority",2); + }else if(roleKeys.contains("fzjlRole")||roleKeys.contains("admin")||roleKeys.contains("zjlRole")){ + variables.put("authority",3); + } + } + /** * 删除仓库库存报损对象 * diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageMapper.xml index cf52cf9e..ff5b7446 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageMapper.xml @@ -4,14 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - @@ -25,10 +24,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + - select report_damage_id, report_damage_code, warehous_scrap_type, make_no, whether_make_no, apply_dept, apply_time, material_no, material_name, material_total, num_total, warehouse_code, warehouse_name, warehouse_store_address, remark, create_time, create_by, update_by, update_time from warehouse_inventory_report_damage + select report_damage_id, report_damage_code, warehous_scrap_type, make_no, + whether_make_no, apply_dept, material_no, material_name, + material_total, num_total, warehouse_code, warehouse_name, + warehouse_store_address, remark, create_time, create_by, update_by, + update_time,audit_status,use_status,instance_id,instance_type, + submit_instance_id,apply_title,apply_time,apply_user,cancel_instance_id, + restore_instance_id,cancel_remark from warehouse_inventory_report_damage - - - - - - - -
- -
- -
-
-
- +
-
- - -
+
- +
- +
@@ -52,6 +35,22 @@
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
@@ -122,32 +121,32 @@ modalName: "仓库库存报损物料信息", data: [[${warehouseInventoryReportDamage.warehouseInventoryReportDamageChildList}]], columns: [ - {title: '库存报损id', field: 'reportDamageChildId', visible: false}, - {title: '报损单号', field: 'reportDamageCode',visible: false}, - {title: '料号', field: 'materialNo',}, - {title: '图片', field: 'materialPhotourl',}, - {title: '物料名称', field: 'materialName',}, - {title: '物料类型', field: 'materialType', + {title: '库存报损id', field: 'reportDamageChildId', visible: false, align: 'center',}, + {title: '报损单号', field: 'reportDamageCode',visible: false, align: 'center',}, + {title: '料号', field: 'materialNo',align: 'center',}, + {title: '图片', field: 'materialPhotourl',align: 'center',}, + {title: '物料名称', field: 'materialName',align: 'center',}, + {title: '物料类型', field: 'materialType',align: 'center', formatter: function(value, row, index) { return $.table.selectCategoryLabel(materialTypeDatas, value); } }, - {title: '描述', field: 'materialDescribe',}, - {title: '品牌', field: 'materialBrand',}, - {title: '单位', field: 'materialUnit',}, - {title: '实际报废数量', field: 'actualScrapQuantity', + {title: '描述', field: 'materialDescribe',align: 'center',}, + {title: '品牌', field: 'materialBrand',align: 'center',}, + {title: '单位', field: 'materialUnit',align: 'center',}, + {title: '实际报废数量', field: 'actualScrapQuantity',align: 'center', }, - {title: '报废类型', field: 'scrapType', + {title: '报废类型', field: 'scrapType',align: 'center', }, - {title: '报废明细', field: 'scrapDetail', + {title: '报废明细', field: 'scrapDetail',align: 'center', }, - {title: '品质判定', field: 'qualityAssessment', + {title: '品质判定', field: 'qualityAssessment',align: 'center', }, - {title: '预估价值(RMB)', field: 'estimatedValueRmb', + {title: '预估价值(RMB)', field: 'estimatedValueRmb',align: 'center', }, - {title: '责任单位', field: 'responsibleUnit', + {title: '责任单位', field: 'responsibleUnit',align: 'center', }, - {title: '备注', field: 'remark', + {title: '备注', field: 'remark',align: 'center', }, { title: '报损报告', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html index ade3c373..4b2c39f1 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html @@ -49,10 +49,10 @@
  • - - + + - - +
  •  搜索 @@ -78,12 +78,16 @@
    • + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskFzjlVerify.html new file mode 100644 index 00000000..378f1884 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskFzjlVerify.html @@ -0,0 +1,221 @@ + + + + + + + + +
    +
    + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    + 报损物料信息 +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskModifyApply.html new file mode 100644 index 00000000..204ab18b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/taskModifyApply.html @@ -0,0 +1,426 @@ + + + + + + + + + + +
    +
    + + + + + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + + + +
    +
    +
    + 选择物料 + + 选择物料 + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + \ No newline at end of file