From e8f49fae104be3de10d73389173dbf6140a347ee Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 16 Apr 2024 15:31:06 +0800 Subject: [PATCH] =?UTF-8?q?[add]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8D=95=20=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A1=AB=E5=85=85=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseStorageController.java | 151 ++++++++ .../purchase/domain/PurchaseStorage.java | 342 ++++++++++++++++++ .../mapper/PurchaseStorageMapper.java | 77 ++++ .../service/IPurchaseStorageService.java | 75 ++++ .../impl/PurchaseStorageServiceImpl.java | 126 +++++++ .../mapper/purchase/PurchaseQuoteMapper.xml | 2 +- .../mapper/purchase/PurchaseStorageMapper.xml | 167 +++++++++ .../purchase/purchaseQuote/purchaseQuote.html | 6 +- .../purchase/purchaseStorage/add.html | 208 +++++++++++ .../purchase/purchaseStorage/edit.html | 209 +++++++++++ .../purchaseStorage/purchaseStorage.html | 246 +++++++++++++ 11 files changed, 1606 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorage.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java new file mode 100644 index 00000000..b4fb8712 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java @@ -0,0 +1,151 @@ +package com.ruoyi.purchase.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.purchase.domain.PurchaseStorage; +import com.ruoyi.purchase.service.IPurchaseStorageService; +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 刘晓旭 + * @date 2024-04-16 + */ +@Controller +@RequestMapping("/purchase/purchaseStorage") +public class PurchaseStorageController extends BaseController +{ + private String prefix = "purchase/purchaseStorage"; + + @Autowired + private IPurchaseStorageService purchaseStorageService; + + @RequiresPermissions("purchase:purchaseStorage:view") + @GetMapping() + public String purchaseStorage() + { + return prefix + "/purchaseStorage"; + } + + /** + * 查询采购入库通知单列表 + */ + @RequiresPermissions("purchase:purchaseStorage:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(PurchaseStorage purchaseStorage) + { + startPage(); + List list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage); + return getDataTable(list); + } + + /** + * 导出采购入库通知单列表 + */ + @RequiresPermissions("purchase:purchaseStorage:export") + @Log(title = "采购入库通知单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(PurchaseStorage purchaseStorage) + { + List list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage); + ExcelUtil util = new ExcelUtil(PurchaseStorage.class); + return util.exportExcel(list, "采购入库通知单数据"); + } + + /** + * 新增采购入库通知单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存采购入库通知单 + */ + @RequiresPermissions("purchase:purchaseStorage:add") + @Log(title = "采购入库通知单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(PurchaseStorage purchaseStorage) + { + return toAjax(purchaseStorageService.insertPurchaseStorage(purchaseStorage)); + } + + /** + * 修改采购入库通知单 + */ + @GetMapping("/edit/{purchaseStorageId}") + public String edit(@PathVariable("purchaseStorageId") Long purchaseStorageId, ModelMap mmap) + { + PurchaseStorage purchaseStorage = purchaseStorageService.selectPurchaseStorageById(purchaseStorageId); + mmap.put("purchaseStorage", purchaseStorage); + return prefix + "/edit"; + } + + /** + * 修改保存采购入库通知单 + */ + @RequiresPermissions("purchase:purchaseStorage:edit") + @Log(title = "采购入库通知单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(PurchaseStorage purchaseStorage) + { + return toAjax(purchaseStorageService.updatePurchaseStorage(purchaseStorage)); + } + + /** + * 删除采购入库通知单 + */ + @RequiresPermissions("purchase:purchaseStorage:remove") + @Log(title = "采购入库通知单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(purchaseStorageService.deletePurchaseStorageByIds(ids)); + } + + /** + * 作废采购入库通知单 + */ + @RequiresPermissions("purchase:purchaseStorage:cancel") + @Log(title = "采购入库通知单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(purchaseStorageService.cancelPurchaseStorageById(id)); + } + + /** + * 恢复采购入库通知单 + */ + @RequiresPermissions("purchase:purchaseStorage:restore") + @Log(title = "采购入库通知单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(purchaseStorageService.restorePurchaseStorageById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorage.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorage.java new file mode 100644 index 00000000..3cad5db9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorage.java @@ -0,0 +1,342 @@ +package com.ruoyi.purchase.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 采购入库通知单对象 purchase_storage + * + * @author 刘晓旭 + * @date 2024-04-16 + */ +public class PurchaseStorage extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 采购入库单id */ + private Long purchaseStorageId; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String purchaseStorageCode; + + /** 关联订单号 */ + @Excel(name = "关联订单号") + private String purchaseOrderCode; + + /** 入库状态 */ + @Excel(name = "入库状态") + private String storageStatus; + + /** 品质状态 */ + @Excel(name = "品质状态") + private String qualityStatus; + + /** 入库类型 */ + @Excel(name = "入库类型") + private String purchaseStorageType; + + /** 订单类型 */ + @Excel(name = "订单类型") + private String purchaseOrderType; + + /** 入库部门 */ + @Excel(name = "入库部门") + private String purchaseDeptType; + + /** 通知已到货数量 */ + @Excel(name = "通知已到货数量") + private Long notifyArrivedNum; + + /** 实际已到货数量 */ + @Excel(name = "实际已到货数量") + private Long actualArrivedNum; + + /** 暂收合格数量 */ + @Excel(name = "暂收合格数量") + private Long temporaryQualifiedNum; + + /** 暂收不合格数量 */ + @Excel(name = "暂收不合格数量") + private Long temporaryUnqualifiedNum; + + /** 品质合格数量 */ + @Excel(name = "品质合格数量") + private Long qualityQualifiedNum; + + /** 入库数量 */ + @Excel(name = "入库数量") + private Long storageNum; + + /** 到货时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date arrivedTime; + + /** 暂收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "暂收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date temporaryTime; + + /** 交付质检时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date deliveryInspectionTime; + + /** 品质时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "品质时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date qualityTime; + + /** 入库时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date storageTime; + + /** 仓库员 */ + @Excel(name = "仓库员") + private String storageEmployee; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long stockId; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String stockName; + + public void setPurchaseStorageId(Long purchaseStorageId) + { + this.purchaseStorageId = purchaseStorageId; + } + + public Long getPurchaseStorageId() + { + return purchaseStorageId; + } + public void setPurchaseStorageCode(String purchaseStorageCode) + { + this.purchaseStorageCode = purchaseStorageCode; + } + + public String getPurchaseStorageCode() + { + return purchaseStorageCode; + } + public void setPurchaseOrderCode(String purchaseOrderCode) + { + this.purchaseOrderCode = purchaseOrderCode; + } + + public String getPurchaseOrderCode() + { + return purchaseOrderCode; + } + public void setStorageStatus(String storageStatus) + { + this.storageStatus = storageStatus; + } + + public String getStorageStatus() + { + return storageStatus; + } + public void setQualityStatus(String qualityStatus) + { + this.qualityStatus = qualityStatus; + } + + public String getQualityStatus() + { + return qualityStatus; + } + public void setPurchaseStorageType(String purchaseStorageType) + { + this.purchaseStorageType = purchaseStorageType; + } + + public String getPurchaseStorageType() + { + return purchaseStorageType; + } + public void setPurchaseOrderType(String purchaseOrderType) + { + this.purchaseOrderType = purchaseOrderType; + } + + public String getPurchaseOrderType() + { + return purchaseOrderType; + } + public void setPurchaseDeptType(String purchaseDeptType) + { + this.purchaseDeptType = purchaseDeptType; + } + + public String getPurchaseDeptType() + { + return purchaseDeptType; + } + public void setNotifyArrivedNum(Long notifyArrivedNum) + { + this.notifyArrivedNum = notifyArrivedNum; + } + + public Long getNotifyArrivedNum() + { + return notifyArrivedNum; + } + public void setActualArrivedNum(Long actualArrivedNum) + { + this.actualArrivedNum = actualArrivedNum; + } + + public Long getActualArrivedNum() + { + return actualArrivedNum; + } + public void setTemporaryQualifiedNum(Long temporaryQualifiedNum) + { + this.temporaryQualifiedNum = temporaryQualifiedNum; + } + + public Long getTemporaryQualifiedNum() + { + return temporaryQualifiedNum; + } + public void setTemporaryUnqualifiedNum(Long temporaryUnqualifiedNum) + { + this.temporaryUnqualifiedNum = temporaryUnqualifiedNum; + } + + public Long getTemporaryUnqualifiedNum() + { + return temporaryUnqualifiedNum; + } + public void setQualityQualifiedNum(Long qualityQualifiedNum) + { + this.qualityQualifiedNum = qualityQualifiedNum; + } + + public Long getQualityQualifiedNum() + { + return qualityQualifiedNum; + } + public void setStorageNum(Long storageNum) + { + this.storageNum = storageNum; + } + + public Long getStorageNum() + { + return storageNum; + } + public void setArrivedTime(Date arrivedTime) + { + this.arrivedTime = arrivedTime; + } + + public Date getArrivedTime() + { + return arrivedTime; + } + public void setTemporaryTime(Date temporaryTime) + { + this.temporaryTime = temporaryTime; + } + + public Date getTemporaryTime() + { + return temporaryTime; + } + public void setDeliveryInspectionTime(Date deliveryInspectionTime) + { + this.deliveryInspectionTime = deliveryInspectionTime; + } + + public Date getDeliveryInspectionTime() + { + return deliveryInspectionTime; + } + public void setQualityTime(Date qualityTime) + { + this.qualityTime = qualityTime; + } + + public Date getQualityTime() + { + return qualityTime; + } + public void setStorageTime(Date storageTime) + { + this.storageTime = storageTime; + } + + public Date getStorageTime() + { + return storageTime; + } + public void setStorageEmployee(String storageEmployee) + { + this.storageEmployee = storageEmployee; + } + + public String getStorageEmployee() + { + return storageEmployee; + } + public void setStockId(Long stockId) + { + this.stockId = stockId; + } + + public Long getStockId() + { + return stockId; + } + public void setStockName(String stockName) + { + this.stockName = stockName; + } + + public String getStockName() + { + return stockName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("purchaseStorageId", getPurchaseStorageId()) + .append("purchaseStorageCode", getPurchaseStorageCode()) + .append("purchaseOrderCode", getPurchaseOrderCode()) + .append("storageStatus", getStorageStatus()) + .append("qualityStatus", getQualityStatus()) + .append("purchaseStorageType", getPurchaseStorageType()) + .append("purchaseOrderType", getPurchaseOrderType()) + .append("purchaseDeptType", getPurchaseDeptType()) + .append("notifyArrivedNum", getNotifyArrivedNum()) + .append("actualArrivedNum", getActualArrivedNum()) + .append("temporaryQualifiedNum", getTemporaryQualifiedNum()) + .append("temporaryUnqualifiedNum", getTemporaryUnqualifiedNum()) + .append("qualityQualifiedNum", getQualityQualifiedNum()) + .append("storageNum", getStorageNum()) + .append("arrivedTime", getArrivedTime()) + .append("temporaryTime", getTemporaryTime()) + .append("deliveryInspectionTime", getDeliveryInspectionTime()) + .append("qualityTime", getQualityTime()) + .append("storageTime", getStorageTime()) + .append("storageEmployee", getStorageEmployee()) + .append("stockId", getStockId()) + .append("stockName", getStockName()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageMapper.java new file mode 100644 index 00000000..1ad22cde --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.purchase.mapper; + +import java.util.List; +import com.ruoyi.purchase.domain.PurchaseStorage; + +/** + * 采购入库通知单Mapper接口 + * + * @author 刘晓旭 + * @date 2024-04-16 + */ +public interface PurchaseStorageMapper +{ + /** + * 查询采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 采购入库通知单 + */ + public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId); + + /** + * 查询采购入库通知单列表 + * + * @param purchaseStorage 采购入库通知单 + * @return 采购入库通知单集合 + */ + public List selectPurchaseStorageList(PurchaseStorage purchaseStorage); + + /** + * 新增采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + public int insertPurchaseStorage(PurchaseStorage purchaseStorage); + + /** + * 修改采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + public int updatePurchaseStorage(PurchaseStorage purchaseStorage); + + /** + * 删除采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + public int deletePurchaseStorageById(Long purchaseStorageId); + + /** + * 批量删除采购入库通知单 + * + * @param purchaseStorageIds 需要删除的数据ID + * @return 结果 + */ + public int deletePurchaseStorageByIds(String[] purchaseStorageIds); + + /** + * 作废采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + public int cancelPurchaseStorageById(Long purchaseStorageId); + + /** + * 恢复采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + public int restorePurchaseStorageById(Long purchaseStorageId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java new file mode 100644 index 00000000..093522bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java @@ -0,0 +1,75 @@ +package com.ruoyi.purchase.service; + +import java.util.List; +import com.ruoyi.purchase.domain.PurchaseStorage; + +/** + * 采购入库通知单Service接口 + * + * @author 刘晓旭 + * @date 2024-04-16 + */ +public interface IPurchaseStorageService +{ + /** + * 查询采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 采购入库通知单 + */ + public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId); + + /** + * 查询采购入库通知单列表 + * + * @param purchaseStorage 采购入库通知单 + * @return 采购入库通知单集合 + */ + public List selectPurchaseStorageList(PurchaseStorage purchaseStorage); + + /** + * 新增采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + public int insertPurchaseStorage(PurchaseStorage purchaseStorage); + + /** + * 修改采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + public int updatePurchaseStorage(PurchaseStorage purchaseStorage); + + /** + * 批量删除采购入库通知单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deletePurchaseStorageByIds(String ids); + + /** + * 删除采购入库通知单信息 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + public int deletePurchaseStorageById(Long purchaseStorageId); + + /** + * 作废采购入库通知单 + * @param purchaseStorageId 采购入库通知单ID + * @return + */ + int cancelPurchaseStorageById(Long purchaseStorageId); + + /** + * 恢复采购入库通知单 + * @param purchaseStorageId 采购入库通知单ID + * @return + */ + int restorePurchaseStorageById(Long purchaseStorageId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java new file mode 100644 index 00000000..71e32f79 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.purchase.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.purchase.mapper.PurchaseStorageMapper; +import com.ruoyi.purchase.domain.PurchaseStorage; +import com.ruoyi.purchase.service.IPurchaseStorageService; +import com.ruoyi.common.core.text.Convert; + +/** + * 采购入库通知单Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-04-16 + */ +@Service +public class PurchaseStorageServiceImpl implements IPurchaseStorageService +{ + @Autowired + private PurchaseStorageMapper purchaseStorageMapper; + + /** + * 查询采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 采购入库通知单 + */ + @Override + public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId) + { + return purchaseStorageMapper.selectPurchaseStorageById(purchaseStorageId); + } + + /** + * 查询采购入库通知单列表 + * + * @param purchaseStorage 采购入库通知单 + * @return 采购入库通知单 + */ + @Override + public List selectPurchaseStorageList(PurchaseStorage purchaseStorage) + { + return purchaseStorageMapper.selectPurchaseStorageList(purchaseStorage); + } + + /** + * 新增采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + @Override + public int insertPurchaseStorage(PurchaseStorage purchaseStorage) + { + purchaseStorage.setCreateTime(DateUtils.getNowDate()); + String loginName = ShiroUtils.getLoginName(); + purchaseStorage.setCreateBy(loginName); + return purchaseStorageMapper.insertPurchaseStorage(purchaseStorage); + } + + /** + * 修改采购入库通知单 + * + * @param purchaseStorage 采购入库通知单 + * @return 结果 + */ + @Override + public int updatePurchaseStorage(PurchaseStorage purchaseStorage) + { + String loginName = ShiroUtils.getLoginName(); + purchaseStorage.setUpdateBy(loginName); + purchaseStorage.setUpdateTime(DateUtils.getNowDate()); + return purchaseStorageMapper.updatePurchaseStorage(purchaseStorage); + } + + /** + * 删除采购入库通知单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deletePurchaseStorageByIds(String ids) + { + return purchaseStorageMapper.deletePurchaseStorageByIds(Convert.toStrArray(ids)); + } + + /** + * 删除采购入库通知单信息 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + @Override + public int deletePurchaseStorageById(Long purchaseStorageId) + { + return purchaseStorageMapper.deletePurchaseStorageById(purchaseStorageId); + } + + /** + * 作废采购入库通知单 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + @Override + public int cancelPurchaseStorageById(Long purchaseStorageId) + { + return purchaseStorageMapper.cancelPurchaseStorageById(purchaseStorageId); + } + + /** + * 恢复采购入库通知单信息 + * + * @param purchaseStorageId 采购入库通知单ID + * @return 结果 + */ + @Override + public int restorePurchaseStorageById(Long purchaseStorageId) + { + return purchaseStorageMapper.restorePurchaseStorageById(purchaseStorageId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml index 2613b118..f7e447ed 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and first_add_time between #{params.beginFirstAddTime} and #{params.endFirstAddTime} and update_info_time = #{updateInfoTime} and material_name like concat('%', #{materialName}, '%') - and create_time = #{createTime} + and create_time between #{params.beginCreateTime} and #{params.endCreateTime} and audit_status = #{auditStatus} and use_status = #{useStatus} diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageMapper.xml new file mode 100644 index 00000000..61bf85e4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select purchase_storage_id, purchase_storage_code, purchase_order_code, storage_status, quality_status, purchase_storage_type, purchase_order_type, purchase_dept_type, notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num, quality_qualified_num, storage_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, storage_employee, stock_id, stock_name, create_time, create_by, update_by, update_time from purchase_storage + + + + + + + + insert into purchase_storage + + purchase_storage_code, + purchase_order_code, + storage_status, + quality_status, + purchase_storage_type, + purchase_order_type, + purchase_dept_type, + notify_arrived_num, + actual_arrived_num, + temporary_qualified_num, + temporary_unqualified_num, + quality_qualified_num, + storage_num, + arrived_time, + temporary_time, + delivery_inspection_time, + quality_time, + storage_time, + storage_employee, + stock_id, + stock_name, + create_time, + create_by, + update_by, + update_time, + + + #{purchaseStorageCode}, + #{purchaseOrderCode}, + #{storageStatus}, + #{qualityStatus}, + #{purchaseStorageType}, + #{purchaseOrderType}, + #{purchaseDeptType}, + #{notifyArrivedNum}, + #{actualArrivedNum}, + #{temporaryQualifiedNum}, + #{temporaryUnqualifiedNum}, + #{qualityQualifiedNum}, + #{storageNum}, + #{arrivedTime}, + #{temporaryTime}, + #{deliveryInspectionTime}, + #{qualityTime}, + #{storageTime}, + #{storageEmployee}, + #{stockId}, + #{stockName}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + + + + + update purchase_storage + + purchase_storage_code = #{purchaseStorageCode}, + purchase_order_code = #{purchaseOrderCode}, + storage_status = #{storageStatus}, + quality_status = #{qualityStatus}, + purchase_storage_type = #{purchaseStorageType}, + purchase_order_type = #{purchaseOrderType}, + purchase_dept_type = #{purchaseDeptType}, + notify_arrived_num = #{notifyArrivedNum}, + actual_arrived_num = #{actualArrivedNum}, + temporary_qualified_num = #{temporaryQualifiedNum}, + temporary_unqualified_num = #{temporaryUnqualifiedNum}, + quality_qualified_num = #{qualityQualifiedNum}, + storage_num = #{storageNum}, + arrived_time = #{arrivedTime}, + temporary_time = #{temporaryTime}, + delivery_inspection_time = #{deliveryInspectionTime}, + quality_time = #{qualityTime}, + storage_time = #{storageTime}, + storage_employee = #{storageEmployee}, + stock_id = #{stockId}, + stock_name = #{stockName}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where purchase_storage_id = #{purchaseStorageId} + + + + delete from purchase_storage where purchase_storage_id = #{purchaseStorageId} + + + + delete from purchase_storage where purchase_storage_id in + + #{purchaseStorageId} + + + + + update purchase_storage set del_flag = '1' where purchase_storage_id = #{purchaseStorageId} + + + + update purchase_storage set del_flag = '0' where purchase_storage_id = #{purchaseStorageId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html index cc4de6f3..752deca6 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html @@ -37,9 +37,11 @@ -
  • +
  • - + + - +
  • diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/add.html new file mode 100644 index 00000000..0d044a04 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/add.html @@ -0,0 +1,208 @@ + + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/edit.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/edit.html new file mode 100644 index 00000000..0e7f0aae --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/edit.html @@ -0,0 +1,209 @@ + + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html new file mode 100644 index 00000000..f342daf0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html @@ -0,0 +1,246 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file