From 38e2747f1ee6d1aac569795b9762444227798d74 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 2 Sep 2024 08:56:36 +0800 Subject: [PATCH] =?UTF-8?q?[feat]:=20=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E6=8D=9F=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E5=AF=B9=E8=B1=A1=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1mapper=EF=BC=8CController,service=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E6=8D=9F=E6=95=B0=E6=8D=AE=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eInventoryReportDamageChildController.java | 151 +++++++++ .../VO/WarehouseInventoryReportDamegeVo.java | 102 ++++++ .../WarehouseInventoryReportDamage.java | 120 +++++++ .../WarehouseInventoryReportDamageChild.java | 309 ++++++++++++++++++ ...houseInventoryReportDamageChildMapper.java | 100 ++++++ .../WarehouseInventoryReportDamageMapper.java | 2 + ...ouseInventoryReportDamageChildService.java | 91 ++++++ ...InventoryReportDamageChildServiceImpl.java | 136 ++++++++ ...houseInventoryReportDamageServiceImpl.java | 70 +++- ...ehouseInventoryReportDamageChildMapper.xml | 195 +++++++++++ .../warehouse/inventoryCheck/add.html | 3 - .../warehouse/inventoryCheck/detail.html | 5 + .../warehouse/inventoryReportDamage/add.html | 121 ++++++- .../inventoryReportDamage/detail.html | 99 +++++- .../warehouse/inventoryReportDamage/edit.html | 122 ++++++- .../inventoryReportDamage.html | 134 +++----- 16 files changed, 1634 insertions(+), 126 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageChildController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageChildMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageChildService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageChildServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageChildMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageChildController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageChildController.java new file mode 100644 index 00000000..3928829a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageChildController.java @@ -0,0 +1,151 @@ +package com.ruoyi.warehouse.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; +import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 仓库库存报损物料信息Controller + * + * @author zhang + * @date 2024-08-29 + */ +@Controller +@RequestMapping("/warehouse/inventoryReportDamageChild") +public class WarehouseInventoryReportDamageChildController extends BaseController +{ + private String prefix = "warehouse/inventoryReportDamageChild"; + + @Autowired + private IWarehouseInventoryReportDamageChildService warehouseInventoryReportDamageChildService; + + @RequiresPermissions("warehouse:inventoryReportDamageChild:view") + @GetMapping() + public String inventoryReportDamageChild() + { + return prefix + "/inventoryReportDamageChild"; + } + + /** + * 查询仓库库存报损物料信息列表 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + startPage(); + List list = warehouseInventoryReportDamageChildService.selectWarehouseInventoryReportDamageChildList(warehouseInventoryReportDamageChild); + return getDataTable(list); + } + + /** + * 导出仓库库存报损物料信息列表 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:export") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + List list = warehouseInventoryReportDamageChildService.selectWarehouseInventoryReportDamageChildList(warehouseInventoryReportDamageChild); + ExcelUtil util = new ExcelUtil(WarehouseInventoryReportDamageChild.class); + return util.exportExcel(list, "仓库库存报损物料信息数据"); + } + + /** + * 新增仓库库存报损物料信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存仓库库存报损物料信息 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:add") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + return toAjax(warehouseInventoryReportDamageChildService.insertWarehouseInventoryReportDamageChild(warehouseInventoryReportDamageChild)); + } + + /** + * 修改仓库库存报损物料信息 + */ +// @GetMapping("/edit/{reportDamageChildId}") + public String edit(@PathVariable("reportDamageChildId") Long reportDamageChildId, ModelMap mmap) + { + WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild = warehouseInventoryReportDamageChildService.selectWarehouseInventoryReportDamageChildById(reportDamageChildId); + mmap.put("warehouseInventoryReportDamageChild", warehouseInventoryReportDamageChild); + return prefix + "/edit"; + } + + /** + * 修改保存仓库库存报损物料信息 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:edit") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + return toAjax(warehouseInventoryReportDamageChildService.updateWarehouseInventoryReportDamageChild(warehouseInventoryReportDamageChild)); + } + + /** + * 删除仓库库存报损物料信息 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:remove") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByIds(ids)); + } + + /** + * 作废仓库库存报损物料信息 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:cancel") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(warehouseInventoryReportDamageChildService.cancelWarehouseInventoryReportDamageChildById(id)); + } + + /** + * 恢复仓库库存报损物料信息 + */ +// @RequiresPermissions("warehouse:inventoryReportDamageChild:restore") + @Log(title = "仓库库存报损物料信息", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(warehouseInventoryReportDamageChildService.restoreWarehouseInventoryReportDamageChildById(id)); + } + + +} 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 new file mode 100644 index 00000000..7b71b370 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseInventoryReportDamegeVo.java @@ -0,0 +1,102 @@ +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 1a9996b2..11e92b94 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 @@ -1,6 +1,8 @@ package com.ruoyi.warehouse.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -73,6 +75,36 @@ public class WarehouseInventoryReportDamage extends BaseEntity @Excel(name = "仓库存放地址") private String warehouseStoreAddress; + /** 流程实例ID */ + private String instanceId; + + /** 流程实例类型 */ + private String instanceType; + + /** 提交流程实例ID */ + private String submitInstanceId; + + /** 作废流程实例ID */ + private String cancelInstanceId; + + /** 恢复流程实例ID */ + private String restoreInstanceId; + + /** 申请人 */ + private String applyTitle; + + /** 申请人 */ + @Excel(name = "申请人",sort = 10) + private String applyUser; + + private Long photoAttachId; + + private String fileIdStr; + + private String removeFileIdStr; + + private List warehouseInventoryReportDamageChildList; + public void setReportDamageId(Long reportDamageId) { this.reportDamageId = reportDamageId; @@ -200,6 +232,94 @@ public class WarehouseInventoryReportDamage extends BaseEntity return warehouseStoreAddress; } + public List getWarehouseInventoryReportDamageChildList() { + return warehouseInventoryReportDamageChildList; + } + + public void setWarehouseInventoryReportDamageChildList(List warehouseInventoryReportDamageChildList) { + this.warehouseInventoryReportDamageChildList = warehouseInventoryReportDamageChildList; + } + + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public String getInstanceType() { + return instanceType; + } + + public void setInstanceType(String instanceType) { + this.instanceType = instanceType; + } + + public String getSubmitInstanceId() { + return submitInstanceId; + } + + public void setSubmitInstanceId(String submitInstanceId) { + this.submitInstanceId = submitInstanceId; + } + + public String getCancelInstanceId() { + return cancelInstanceId; + } + + public void setCancelInstanceId(String cancelInstanceId) { + this.cancelInstanceId = cancelInstanceId; + } + + public String getRestoreInstanceId() { + return restoreInstanceId; + } + + public void setRestoreInstanceId(String restoreInstanceId) { + this.restoreInstanceId = restoreInstanceId; + } + + public String getApplyTitle() { + return applyTitle; + } + + public void setApplyTitle(String applyTitle) { + this.applyTitle = applyTitle; + } + + public String getApplyUser() { + return applyUser; + } + + public void setApplyUser(String applyUser) { + this.applyUser = applyUser; + } + + public Long getPhotoAttachId() { + return photoAttachId; + } + + public void setPhotoAttachId(Long photoAttachId) { + this.photoAttachId = photoAttachId; + } + + public String getFileIdStr() { + return fileIdStr; + } + + public void setFileIdStr(String fileIdStr) { + this.fileIdStr = fileIdStr; + } + + public String getRemoveFileIdStr() { + return removeFileIdStr; + } + + public void setRemoveFileIdStr(String removeFileIdStr) { + this.removeFileIdStr = removeFileIdStr; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java new file mode 100644 index 00000000..be555214 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseInventoryReportDamageChild.java @@ -0,0 +1,309 @@ +package com.ruoyi.warehouse.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 仓库库存报损物料信息对象 warehouse_inventory_report_damage_child + * + * @author zhang + * @date 2024-08-29 + */ +public class WarehouseInventoryReportDamageChild extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 库存报损id */ + private Long reportDamageChildId; + + /** 关联生产单号 */ + @Excel(name = "关联生产单号") + private String makeNo; + + /** 报损单号 */ + @Excel(name = "报损单号") + private String reportDamageCode; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 图片 */ + @Excel(name = "图片") + private String materialPhotourl; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 描述 */ + @Excel(name = "描述") + private String materialDescribe; + + /** 品牌 */ + @Excel(name = "品牌") + private String materialBrand; + + /** 实际报废数量 */ + @Excel(name = "实际报废数量") + private BigDecimal actualScrapQuantity; + + /** 报废类型 */ + @Excel(name = "报废类型") + private String scrapType; + + /** 报废明细 */ + @Excel(name = "报废明细") + private String scrapDetail; + + /** 品质判定 */ + @Excel(name = "品质判定") + private String qualityAssessment; + + /** 预估价值(RMB) */ + @Excel(name = "预估价值(RMB)") + private BigDecimal estimatedValueRmb; + + /** 责任单位 */ + @Excel(name = "责任单位") + private String responsibleUnit; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseCode; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 仓库存放地址 */ + @Excel(name = "仓库存放地址") + private String warehouseStoreAddress; + + /** 申请部门ID */ + @Excel(name = "申请部门ID") + private String applyDeptId; + + /** 申请部门 */ + @Excel(name = "申请部门") + private String applyDept; + + public void setReportDamageChildId(Long reportDamageChildId) + { + this.reportDamageChildId = reportDamageChildId; + } + + public Long getReportDamageChildId() + { + return reportDamageChildId; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + public void setReportDamageCode(String reportDamageCode) + { + this.reportDamageCode = reportDamageCode; + } + + public String getReportDamageCode() + { + return reportDamageCode; + } + public void setMaterialNo(String materialNo) + { + this.materialNo = materialNo; + } + + public String getMaterialNo() + { + return materialNo; + } + public void setMaterialPhotourl(String materialPhotourl) + { + this.materialPhotourl = materialPhotourl; + } + + public String getMaterialPhotourl() + { + return materialPhotourl; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setMaterialDescribe(String materialDescribe) + { + this.materialDescribe = materialDescribe; + } + + public String getMaterialDescribe() + { + return materialDescribe; + } + public void setMaterialBrand(String materialBrand) + { + this.materialBrand = materialBrand; + } + + public String getMaterialBrand() + { + return materialBrand; + } + public void setActualScrapQuantity(BigDecimal actualScrapQuantity) + { + this.actualScrapQuantity = actualScrapQuantity; + } + + public BigDecimal getActualScrapQuantity() + { + return actualScrapQuantity; + } + public void setScrapType(String scrapType) + { + this.scrapType = scrapType; + } + + public String getScrapType() + { + return scrapType; + } + public void setScrapDetail(String scrapDetail) + { + this.scrapDetail = scrapDetail; + } + + public String getScrapDetail() + { + return scrapDetail; + } + public void setQualityAssessment(String qualityAssessment) + { + this.qualityAssessment = qualityAssessment; + } + + public String getQualityAssessment() + { + return qualityAssessment; + } + public void setEstimatedValueRmb(BigDecimal estimatedValueRmb) + { + this.estimatedValueRmb = estimatedValueRmb; + } + + public BigDecimal getEstimatedValueRmb() + { + return estimatedValueRmb; + } + public void setResponsibleUnit(String responsibleUnit) + { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnit() + { + return responsibleUnit; + } + public void setWarehouseCode(String warehouseCode) + { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseCode() + { + return warehouseCode; + } + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setWarehouseStoreAddress(String warehouseStoreAddress) + { + this.warehouseStoreAddress = warehouseStoreAddress; + } + + public String getWarehouseStoreAddress() + { + return warehouseStoreAddress; + } + public void setApplyDeptId(String applyDeptId) + { + this.applyDeptId = applyDeptId; + } + + public String getApplyDeptId() + { + return applyDeptId; + } + public void setApplyDept(String applyDept) + { + this.applyDept = applyDept; + } + + public String getApplyDept() + { + return applyDept; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("reportDamageChildId", getReportDamageChildId()) + .append("makeNo", getMakeNo()) + .append("reportDamageCode", getReportDamageCode()) + .append("materialNo", getMaterialNo()) + .append("materialPhotourl", getMaterialPhotourl()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("materialDescribe", getMaterialDescribe()) + .append("materialBrand", getMaterialBrand()) + .append("actualScrapQuantity", getActualScrapQuantity()) + .append("scrapType", getScrapType()) + .append("scrapDetail", getScrapDetail()) + .append("qualityAssessment", getQualityAssessment()) + .append("estimatedValueRmb", getEstimatedValueRmb()) + .append("responsibleUnit", getResponsibleUnit()) + .append("remark", getRemark()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("warehouseStoreAddress", getWarehouseStoreAddress()) + .append("applyDeptId", getApplyDeptId()) + .append("applyDept", getApplyDept()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageChildMapper.java new file mode 100644 index 00000000..491f1708 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageChildMapper.java @@ -0,0 +1,100 @@ +package com.ruoyi.warehouse.mapper; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库库存报损物料信息Mapper接口 + * + * @author zhang + * @date 2024-08-29 + */ +@Mapper +public interface WarehouseInventoryReportDamageChildMapper +{ + /** + * 查询仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 仓库库存报损物料信息 + */ + public WarehouseInventoryReportDamageChild selectWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + /** + * 查询仓库库存报损物料信息 + * + * @param reportDamageCode 仓库库存报损物料信息code + * @return 仓库库存报损物料信息 + */ + public WarehouseInventoryReportDamageChild selectWarehouseInventoryReportDamageChildByCode(String reportDamageCode); + + /** + * 查询仓库库存报损物料信息列表 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 仓库库存报损物料信息集合 + */ + public List selectWarehouseInventoryReportDamageChildList(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 新增仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + public int insertWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 修改仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + public int updateWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 删除仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + /** + * 删除仓库库存报损物料信息 + * + * @param reportDamageCode 仓库库存报损物料信息关联单号 + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByCode(String reportDamageCode); + + /** + * 批量删除仓库库存报损物料信息 + * + * @param reportDamageChildIds 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByIds(String[] reportDamageChildIds); + /** + * 批量删除仓库库存报损物料信息 + * + * @param reportDamageCodes 需要删除的数据关联单号 + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByCodes(String[] reportDamageCodes); + + /** + * 作废仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + public int cancelWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + + /** + * 恢复仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + public int restoreWarehouseInventoryReportDamageChildById(Long reportDamageChildId); +} 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 9d9c6f19..18c09294 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 @@ -2,6 +2,7 @@ package com.ruoyi.warehouse.mapper; import java.util.List; import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** @@ -10,6 +11,7 @@ import org.apache.ibatis.annotations.Param; * @author 刘晓旭 * @date 2024-05-31 */ +@Mapper public interface WarehouseInventoryReportDamageMapper { /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageChildService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageChildService.java new file mode 100644 index 00000000..1d416c67 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryReportDamageChildService.java @@ -0,0 +1,91 @@ +package com.ruoyi.warehouse.service; + +import java.util.List; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库库存报损物料信息Service接口 + * + * @author zhang + * @date 2024-08-29 + */ +public interface IWarehouseInventoryReportDamageChildService +{ + /** + * 查询仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 仓库库存报损物料信息 + */ + public WarehouseInventoryReportDamageChild selectWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + + /** + * 查询仓库库存报损物料信息列表 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 仓库库存报损物料信息集合 + */ + public List selectWarehouseInventoryReportDamageChildList(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 新增仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + public int insertWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 修改仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + public int updateWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild); + + /** + * 批量删除仓库库存报损物料信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByIds(String ids); + /** + * 批量删除仓库库存报损物料信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByCodes(String ids); + + /** + * 删除仓库库存报损物料信息信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + + /** + * 删除仓库库存报损物料信息信息 + * + * @param reportDamageCode 仓库库存报损物料信息Code + * @return 结果 + */ + public int deleteWarehouseInventoryReportDamageChildByCode(String reportDamageCode); + + /** + * 作废仓库库存报损物料信息 + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return + */ + int cancelWarehouseInventoryReportDamageChildById(Long reportDamageChildId); + + /** + * 恢复仓库库存报损物料信息 + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return + */ + int restoreWarehouseInventoryReportDamageChildById(Long reportDamageChildId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageChildServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageChildServiceImpl.java new file mode 100644 index 00000000..04ffff8a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageChildServiceImpl.java @@ -0,0 +1,136 @@ +package com.ruoyi.warehouse.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild; +import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageChildMapper; +import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.text.Convert; + +/** + * 仓库库存报损物料信息Service业务层处理 + * + * @author zhang + * @date 2024-08-29 + */ +@Service +public class WarehouseInventoryReportDamageChildServiceImpl implements IWarehouseInventoryReportDamageChildService +{ + @Autowired + private WarehouseInventoryReportDamageChildMapper warehouseInventoryReportDamageChildMapper; + + /** + * 查询仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 仓库库存报损物料信息 + */ + @Override + public WarehouseInventoryReportDamageChild selectWarehouseInventoryReportDamageChildById(Long reportDamageChildId) + { + return warehouseInventoryReportDamageChildMapper.selectWarehouseInventoryReportDamageChildById(reportDamageChildId); + } + + /** + * 查询仓库库存报损物料信息列表 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 仓库库存报损物料信息 + */ + @Override + public List selectWarehouseInventoryReportDamageChildList(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + return warehouseInventoryReportDamageChildMapper.selectWarehouseInventoryReportDamageChildList(warehouseInventoryReportDamageChild); + } + + /** + * 新增仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + @Override + public int insertWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate()); + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryReportDamageChild.setCreateBy(loginName); + return warehouseInventoryReportDamageChildMapper.insertWarehouseInventoryReportDamageChild(warehouseInventoryReportDamageChild); + } + + /** + * 修改仓库库存报损物料信息 + * + * @param warehouseInventoryReportDamageChild 仓库库存报损物料信息 + * @return 结果 + */ + @Override + public int updateWarehouseInventoryReportDamageChild(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild) + { + String loginName = ShiroUtils.getLoginName(); + warehouseInventoryReportDamageChild.setUpdateBy(loginName); + warehouseInventoryReportDamageChild.setUpdateTime(DateUtils.getNowDate()); + return warehouseInventoryReportDamageChildMapper.updateWarehouseInventoryReportDamageChild(warehouseInventoryReportDamageChild); + } + + /** + * 删除仓库库存报损物料信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryReportDamageChildByIds(String ids) + { + return warehouseInventoryReportDamageChildMapper.deleteWarehouseInventoryReportDamageChildByIds(Convert.toStrArray(ids)); + } + + @Override + public int deleteWarehouseInventoryReportDamageChildByCodes(String ids) { + return warehouseInventoryReportDamageChildMapper.deleteWarehouseInventoryReportDamageChildByCodes(Convert.toStrArray(ids)); + } + + /** + * 删除仓库库存报损物料信息信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + @Override + public int deleteWarehouseInventoryReportDamageChildById(Long reportDamageChildId) + { + return warehouseInventoryReportDamageChildMapper.deleteWarehouseInventoryReportDamageChildById(reportDamageChildId); + } + + @Override + public int deleteWarehouseInventoryReportDamageChildByCode(String reportDamageCode) { + return warehouseInventoryReportDamageChildMapper.deleteWarehouseInventoryReportDamageChildByCode(reportDamageCode); + } + + /** + * 作废仓库库存报损物料信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + @Override + public int cancelWarehouseInventoryReportDamageChildById(Long reportDamageChildId) + { + return warehouseInventoryReportDamageChildMapper.cancelWarehouseInventoryReportDamageChildById(reportDamageChildId); + } + + /** + * 恢复仓库库存报损物料信息信息 + * + * @param reportDamageChildId 仓库库存报损物料信息ID + * @return 结果 + */ + @Override + public int restoreWarehouseInventoryReportDamageChildById(Long reportDamageChildId) + { + return warehouseInventoryReportDamageChildMapper.restoreWarehouseInventoryReportDamageChildById(reportDamageChildId); + } +} 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 39999741..739d01de 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,6 +2,7 @@ package com.ruoyi.warehouse.service.impl; import java.text.DecimalFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -9,12 +10,15 @@ 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.warehouse.domain.WarehouseInventoryReportDamageChild; +import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageMapper; import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage; import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; /** * 仓库库存报损Service业务层处理 @@ -28,6 +32,9 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve @Autowired private WarehouseInventoryReportDamageMapper warehouseInventoryReportDamageMapper; + @Autowired + private IWarehouseInventoryReportDamageChildService warehouseInventoryReportDamageChildService; + /** * 查询仓库库存报损 * @@ -59,26 +66,39 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insertWarehouseInventoryReportDamage(WarehouseInventoryReportDamage warehouseInventoryReportDamage) { - - //更改日期格式，以提高可读性 - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - String dataPart = df.format(new Date()); - //移除日期中的分隔符以便于后续处理 - String prefix = "BS"+dataPart.replace("-",""); - + String prefix = "BS"+DateUtils.getDate().replace("-",""); //查询数据库中最大的编号 String maxCode = warehouseInventoryReportDamageMapper.findMaxRoundCode(prefix); - String newCode = generateNewCode(prefix,maxCode); - warehouseInventoryReportDamage.setReportDamageCode(newCode); warehouseInventoryReportDamage.setCreateTime(DateUtils.getNowDate()); String loginName = ShiroUtils.getLoginName(); warehouseInventoryReportDamage.setCreateBy(loginName); + //报损子表数据 + //判断子表数据是否为空 + if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){ + for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()) { + //子表数据不为空，则插入子表数据 + warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); + warehouseInventoryReportDamageChild.setReportDamageCode(newCode); + 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); + } + }else{ + //子表数据为空，则抛出异常 + throw new BusinessException("报损子表数据为空"); + } return warehouseInventoryReportDamageMapper.insertWarehouseInventoryReportDamage(warehouseInventoryReportDamage); } @@ -94,6 +114,27 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve String loginName = ShiroUtils.getLoginName(); warehouseInventoryReportDamage.setUpdateBy(loginName); warehouseInventoryReportDamage.setUpdateTime(DateUtils.getNowDate()); + if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){ + //清除现在的子表信息 + warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode()); + for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()){ + //子表数据不为空，则插入子表数据 + warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo()); + warehouseInventoryReportDamageChild.setReportDamageCode(warehouseInventoryReportDamage.getReportDamageCode()); + 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); + } + + }else{ + //子表数据为空，则抛出异常 + throw new BusinessException("报损子表数据为空"); + } return warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage); } @@ -106,6 +147,15 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve @Override public int deleteWarehouseInventoryReportDamageByIds(String ids) { + String[] code = Convert.toStrArray(ids); + List codes = new ArrayList(); + for(String id:code){ + WarehouseInventoryReportDamage warehouseInventoryReportDamage = warehouseInventoryReportDamageMapper.selectWarehouseInventoryReportDamageById(Long.valueOf(id)); + //删除子表数据 + codes.add(warehouseInventoryReportDamage.getReportDamageCode()); + } + String reportDamageCodes = StringUtils.join(codes,","); + warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCodes(reportDamageCodes); return warehouseInventoryReportDamageMapper.deleteWarehouseInventoryReportDamageByIds(Convert.toStrArray(ids)); } @@ -158,12 +208,10 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve } //解析并递增编号 int sequence = Integer.parseInt(maxCode.substring(5)) + 1 ; - //检查序列号是否溢出 if (sequence > 999){ throw new BusinessException("当日编号已达到最大值999，请检查或调整策略"); } - //格式化序列号，自动补零至三位 DecimalFormat df = new DecimalFormat("000"); diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageChildMapper.xml new file mode 100644 index 00000000..741f5b7a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageChildMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select report_damage_child_id, make_no, report_damage_code, material_no, + material_photoUrl, material_name, material_type, material_describe, material_brand, + actual_scrap_quantity, scrap_type, scrap_detail, quality_assessment, + estimated_value_rmb, responsible_unit, remark, warehouse_code, warehouse_name, + warehouse_store_address, apply_dept_id, apply_dept, create_time, create_by, + update_by, update_time + from warehouse_inventory_report_damage_child + + + + + + + + insert into warehouse_inventory_report_damage_child + + make_no, + report_damage_code, + material_no, + material_photoUrl, + material_name, + material_type, + material_describe, + material_brand, + actual_scrap_quantity, + scrap_type, + scrap_detail, + quality_assessment, + estimated_value_rmb, + responsible_unit, + remark, + warehouse_code, + warehouse_name, + warehouse_store_address, + apply_dept_id, + apply_dept, + create_time, + create_by, + update_by, + update_time, + + + #{makeNo}, + #{reportDamageCode}, + #{materialNo}, + #{materialPhotourl}, + #{materialName}, + #{materialType}, + #{materialDescribe}, + #{materialBrand}, + #{actualScrapQuantity}, + #{scrapType}, + #{scrapDetail}, + #{qualityAssessment}, + #{estimatedValueRmb}, + #{responsibleUnit}, + #{remark}, + #{warehouseCode}, + #{warehouseName}, + #{warehouseStoreAddress}, + #{applyDeptId}, + #{applyDept}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update warehouse_inventory_report_damage_child + + make_no = #{makeNo}, + report_damage_code = #{reportDamageCode}, + material_no = #{materialNo}, + material_photoUrl = #{materialPhotourl}, + material_name = #{materialName}, + material_type = #{materialType}, + material_describe = #{materialDescribe}, + material_brand = #{materialBrand}, + actual_scrap_quantity = #{actualScrapQuantity}, + scrap_type = #{scrapType}, + scrap_detail = #{scrapDetail}, + quality_assessment = #{qualityAssessment}, + estimated_value_rmb = #{estimatedValueRmb}, + responsible_unit = #{responsibleUnit}, + remark = #{remark}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + warehouse_store_address = #{warehouseStoreAddress}, + apply_dept_id = #{applyDeptId}, + apply_dept = #{applyDept}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where report_damage_child_id = #{reportDamageChildId} + + + + delete from warehouse_inventory_report_damage_child where report_damage_child_id = #{reportDamageChildId} + + + delete from warehouse_inventory_report_damage_child where report_damage_code = #{reportDamageCode} + + + delete from warehouse_inventory_report_damage_child where report_damage_child_id in + + #{reportDamageChildId} + + + + delete from warehouse_inventory_report_damage_child where report_damage_code in + + #{reportDamageCode} + + + + update warehouse_inventory_report_damage_child set del_flag = '1' where report_damage_child_id = #{reportDamageChildId} + + + + update warehouse_inventory_report_damage_child set del_flag = '0' where report_damage_child_id = #{reportDamageChildId} + + + update warehouse_inventory_report_damage_child set del_flag = '1' where report_damage_code = #{reportDamageCode} + + + + update warehouse_inventory_report_damage_child set del_flag = '0' where report_damage_code = #{reportDamageCode} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html index 03f20245..3fe921ed 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/add.html @@ -70,14 +70,11 @@ var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; var prefix = ctx + "warehouse/inventoryCheck" $("#form-inventoryCheck-add").validate({focusCleanup: true}); - $("input[name='inventoryCheckDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); - - // 新增提交 function submitHandler() { // 获取表单数据 diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/detail.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/detail.html index 6b6252c6..b122587f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/detail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/detail.html @@ -3,6 +3,9 @@ + + +
@@ -62,6 +65,8 @@
+ +