From d15f4d172d6776299258ca5d36d613298048c4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 27 Nov 2024 19:04:17 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E6=96=B0=E5=A2=9E=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95=E5=AF=BC=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E5=8D=95controller=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=93=81=E8=B4=A8=E5=8D=95=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=94=9F=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95controller=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?controller=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7=E5=93=81=E8=B4=A8=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A5=E6=96=99?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8service=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=93=81=E8=B4=A8=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A5=E6=96=99=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8mapper=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IqcQualityOrderController.java | 40 +++++++++- .../controller/QualityOrderController.java | 35 ++++---- .../ruoyi/quality/domain/QualityOrder.java | 80 ++++++++++++++++--- .../quality/mapper/QualityOrderMapper.java | 15 ++++ .../quality/service/IQualityOrderService.java | 10 +++ .../service/impl/QualityOrderServiceImpl.java | 21 +++++ .../mapper/quality/QualityOrderMapper.xml | 48 ++++++++++- 7 files changed, 217 insertions(+), 32 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/IqcQualityOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/IqcQualityOrderController.java index 3df62ba5..c7e69679 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/IqcQualityOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/IqcQualityOrderController.java @@ -1,11 +1,26 @@ package com.ruoyi.quality.controller; +import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.quality.domain.QualityOrder; +import com.ruoyi.quality.domain.VO.QualityOrderReportVO; +import com.ruoyi.quality.service.IQualityOrderService; +import org.apache.poi.util.StringUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.stream.Collectors; /** * 来料品质单Controller @@ -18,6 +33,9 @@ public class IqcQualityOrderController extends BaseController { private String iqcPrefix = "quality/iqcQualityOrder"; + @Autowired + private IQualityOrderService qualityOrderService; + @RequiresPermissions("quality:iqcQualityOrder:view") @GetMapping() public String qualityOrder() @@ -26,7 +44,27 @@ public class IqcQualityOrderController extends BaseController { } - + /** + * 导出来料品质管理品质单列表 + */ + @PostMapping("/export") + @ResponseBody + public AjaxResult export(QualityOrder qualityOrder,String ids) + { + if(StringUtils.isEmpty(ids)){ + List list = qualityOrderService.selectQualityOrderList(qualityOrder); + List filterList = list.stream()//采购订单（入库）或委外订单（入库） + .filter(item ->(item.getQualityOrderType().equals("0")||item.getQualityOrderType().equals("2")) + &&(item.getQualityStorageStatus().equals("0")||item.getQualityStorageStatus().equals("2"))).collect(Collectors.toList()); + ExcelUtil util = new ExcelUtil(QualityOrder.class); + return util.exportExcel(filterList, "来料品质单数据"); + }else{ + String[] qualityOrderCodes = ids.split(","); + List list = qualityOrderService.selectQualityOrderListByCodes(qualityOrderCodes); + ExcelUtil util = new ExcelUtil(QualityOrder.class); + return util.exportExcel(list, ids); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java index f80f2aec..c16a0bd7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; import com.ruoyi.aftersales.service.IAfterSalesShippingDeviceService; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.quality.domain.QualityOrderDetail; import com.ruoyi.quality.domain.QualityOrderReport; import com.ruoyi.quality.domain.QualityShippingDevice; @@ -79,12 +80,9 @@ public class QualityOrderController extends BaseController @ResponseBody public TableDataInfo iqcOrderList(QualityOrder qualityOrder) { - startPage(); - List list = qualityOrderService.selectQualityOrderList(qualityOrder); - List filterList = list.stream()//采购订单（入库）或委外订单（入库） - .filter(item ->(item.getQualityOrderType().equals("0")||item.getQualityOrderType().equals("2")) - &&(item.getQualityStorageStatus().equals("0")||item.getQualityStorageStatus().equals("2"))).collect(Collectors.toList()); - return getDataTable(filterList); + startPage();//采购订单（入库）或委外订单（入库） + List list = qualityOrderService.selectIqcQualityOrderList(qualityOrder); + return getDataTable(list); } /** @@ -95,10 +93,8 @@ public class QualityOrderController extends BaseController public TableDataInfo makeOrderList(QualityOrder qualityOrder) { startPage(); - List list = qualityOrderService.selectQualityOrderList(qualityOrder); - List filterList = list.stream()//生产订单（入库） - .filter(item ->item.getQualityOrderType().equals("1") &&item.getQualityStorageStatus().equals("4")).collect(Collectors.toList()); - return getDataTable(filterList); + List list = qualityOrderService.selectMakeQualityOrderList(qualityOrder); + return getDataTable(list); } /** @@ -108,11 +104,20 @@ public class QualityOrderController extends BaseController @Log(title = "品质管理品质单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(QualityOrder qualityOrder) - { - List list = qualityOrderService.selectQualityOrderList(qualityOrder); - ExcelUtil util = new ExcelUtil(QualityOrder.class); - return util.exportExcel(list, "品质管理品质单数据"); + public AjaxResult export(QualityOrder qualityOrder,String ids) + { + if(StringUtils.isEmpty(ids)){ + List list = qualityOrderService.selectQualityOrderList(qualityOrder); + List filterList = list.stream()//生产品质单 + .filter(item ->item.getQualityOrderType().equals("1") &&item.getQualityStorageStatus().equals("4")).collect(Collectors.toList()); + ExcelUtil util = new ExcelUtil(QualityOrder.class); + return util.exportExcel(filterList, "生产品质单数据"); + }else{ + String[] qualityOrderCodes = ids.split(","); + List list = qualityOrderService.selectQualityOrderListByCodes(qualityOrderCodes); + ExcelUtil util = new ExcelUtil(QualityOrder.class); + return util.exportExcel(list, ids); + } } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java index 06333ced..76b4951e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java @@ -24,48 +24,51 @@ public class QualityOrder extends BaseEntity private Long qualityOrderId; /** 品质单号 */ - @Excel(name = "品质单号") + @Excel(name = "品质单号",sort = 1) private String qualityOrderCode; /** 入库单号 */ - @Excel(name = "入库单号") + @Excel(name = "入库单号",sort = 3) private String inStorageCode; /** 关联订单号 */ - @Excel(name = "关联订单号") + @Excel(name = "关联订单号",sort = 4) private String relatedOrderCode; /** 品质状态 */ - @Excel(name = "品质状态") + @Excel(name = "品质状态",sort = 2,dictType = "qualityStatus") private String qualityStatus; /** 品质单订单类型 */ - @Excel(name = "品质单订单类型") + @Excel(name = "订单类型",sort = 5,dictType = "quality_order_type") private String qualityOrderType; /** 品质单入库类型 */ - @Excel(name = "品质单入库类型") + @Excel(name = "入库类型",sort = 6,dictType = "quality_storage_status") private String qualityStorageStatus; //料号 + @Excel(name = "料号",sort = 7) private String materialNo; //物料名称 + @Excel(name = "物料名称",sort = 8) private String materialName; //待审核数 + @Excel(name = "待审核数",sort = 12) private int pendingReviewNum; /** 本次到货数量 */ - @Excel(name = "本次到货数量") + @Excel(name = "检验数",sort = 9) private Integer thisArrivedNum; /** 品质合格数 */ - @Excel(name = "品质合格数") + @Excel(name = "合格数",sort = 10) private Integer qualityQualifiedNum; /** 品质不合格数 */ - @Excel(name = "品质不合格数") + @Excel(name = "不良数",sort = 11) private Integer qualityUnqualifiedNum; /** 入库数 */ @@ -75,22 +78,33 @@ public class QualityOrder extends BaseEntity private BigDecimal makeInTotalPrice; /** 仓库Id */ - @Excel(name = "仓库Id") private String warehouseCode; /** 仓库名称 */ - @Excel(name = "仓库名称") private String warehouseName; /** 交付质检时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "交检时间", width = 30, dateFormat = "yyyy-MM-dd",sort = 13) private Date deliveryInspectionTime; /** 品质员工 */ - @Excel(name = "品质员工") + @Excel(name = "品质员",sort = 14) private String qualityEmployee; + @Excel(name = "录入人",sort = 15) + private String createBy; + + @Excel(name = "录入时间",sort = 16,dateFormat = "yyyy-MM-dd") + private Date createTime; + + @Excel(name = "更新人",sort = 17) + private String updateBy; + + @Excel(name = "更新时间",sort = 18,dateFormat = "yyyy-MM-dd") + private Date updateTime; + + /** 品质单详情*/ private List qualityOrderDetailList; @@ -268,6 +282,46 @@ public class QualityOrder extends BaseEntity this.pendingReviewNum = pendingReviewNum; } + @Override + public String getCreateBy() { + return createBy; + } + + @Override + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + @Override + public Date getCreateTime() { + return createTime; + } + + @Override + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public String getUpdateBy() { + return updateBy; + } + + @Override + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + @Override + public Date getUpdateTime() { + return updateTime; + } + + @Override + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java index c918a90c..bebeb294 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java @@ -89,4 +89,19 @@ public interface QualityOrderMapper * 生产入库和委内入库相关品质单数据 * */ List selectAllMakeQualityOrderList(QualityOrder qualityOrder); + + /** + * 按单号批量查询 + * */ + public List selectQualityOrderListByCodes(String[] qualityOrderCodes); + + /* + * 查询来料品质单*/ + public List selectIqcQualityOrderList(QualityOrder qualityOrder); + + /* + * 查询生产品质单*/ + public List selectMakeQualityOrderList(QualityOrder qualityOrder); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java index 31040279..ca0ee1d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java @@ -117,4 +117,14 @@ public interface IQualityOrderService * 修改保存生产入库品质单开始品质 */ int updateMakeStartingQuality(QualityOrder qualityOrder); + + List selectIqcQualityOrderList(QualityOrder qualityOrder); + + //查询来料品质单列表 + List selectMakeQualityOrderList(QualityOrder qualityOrder); + + /** + * 按单号批量查询 + * */ + public List selectQualityOrderListByCodes(String[] qualityOrderCodes); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java index 99a2ad2d..0162d191 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java @@ -104,6 +104,27 @@ public class QualityOrderServiceImpl implements IQualityOrderService return qualityOrderMapper.selectQualityOrderList(qualityOrder); } + //查询来料品质单列表 + @Override + public List selectIqcQualityOrderList(QualityOrder qualityOrder) + { + List qualityOrders = qualityOrderMapper.selectIqcQualityOrderList(qualityOrder); + return qualityOrders; + } + + //查询来料品质单列表 + @Override + public List selectMakeQualityOrderList(QualityOrder qualityOrder) + { + List qualityOrders = qualityOrderMapper.selectMakeQualityOrderList(qualityOrder); + return qualityOrders; + } + + @Override + public List selectQualityOrderListByCodes(String[] qualityOrderCodes){ + return qualityOrderMapper.selectQualityOrderListByCodes(qualityOrderCodes); + } + /** * 新增品质管理品质单 * diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml index c969c566..c4fe27d4 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml @@ -60,11 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + where quality_order_code in + + #{qualityOrderCode} + + + \ No newline at end of file