From f375513ce3c25c2b6d3f1bbabf00afc9ffbb21d4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 19 Jun 2024 20:41:28 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E3=80=81=E5=A7=94=E5=86=85?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=20=E6=96=B0=E5=A2=9E'=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F','=E5=93=81=E8=B4=A8?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F','=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F','=E5=93=81=E8=B4=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=B7','=E5=93=81=E8=B4=A8=E7=8A=B6=E6=80=81','=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7',=E5=B7=A5=E7=A8=8B=E5=91=98?= =?UTF-8?q?=EF=BC=8C'=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B','=E5=AE=A2?= =?UTF-8?q?=E6=88=B7ID','=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0','=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=95=B0=E5=90=88=E8=AE=A1',=20=20'=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=88=E8=AE=A1',=E5=AD=97=E6=AE=B5=20=20=E5=A7=94=E5=86=85?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=8F=98=E9=87=8F=20=20mapper.xml=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E8=AF=AD=E5=8F=A5=20=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93=E5=89=8D=E7=AB=AF=20?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84bug=20=20=E6=96=B0=E5=A2=9E=20=E5=A7=94?= =?UTF-8?q?=E5=86=85=E5=85=A5=E5=BA=93=E5=89=8D=E7=AB=AF=20=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/erp/domain/ErpInboundOrder.java | 234 +++++++++++++++--- .../mapper/erp/ErpInboundOrderMapper.xml | 93 ++++++- .../erp/inboundOrder/inboundOrder.html | 115 ++++++--- 3 files changed, 366 insertions(+), 76 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java index 7771e531..bbafea3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java @@ -9,9 +9,9 @@ import java.util.List; /** * 入库单对象 erp_inbound_order - * + * * @author ruoyi - * @date 2024-04-24 + * @date 2024-06-19 */ public class ErpInboundOrder extends BaseEntity { @@ -23,10 +23,18 @@ public class ErpInboundOrder extends BaseEntity /** 删除标志（0代表存在 1代表删除） */ private String delFlag; + /** 品质单号 */ + @Excel(name = "品质单号") + private String qualityOrderCode; + /** 生产订单号 */ @Excel(name = "生产订单号") private String makeNo; + /** 品质状态(0待品质、1部分品质、全部品质) */ + @Excel(name = "品质状态(0待品质、1部分品质、全部品质)") + private String qualityStatus; + /** 关联销售订单号 */ @Excel(name = "关联销售订单号") private String saleNo; @@ -47,80 +55,229 @@ public class ErpInboundOrder extends BaseEntity @Excel(name = "入库数") private Long inboundNum; + /** 工程员 */ + @Excel(name = "工程员") + private String engineerName; + + /** 生产订单类型 */ + @Excel(name = "生产订单类型") + private String orderType; + + /** 客户Id */ + @Excel(name = "客户Id") + private String customerId; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 客户订单号 */ + @Excel(name = "客户订单号") + private String salesOrderNumber; + + /** 物料合计 */ + @Excel(name = "物料合计") + private Long materialTotal; + + /** 数量合计 */ + @Excel(name = "数量合计") + private Long numTotal; + + /** 品质合格数量 */ + @Excel(name = "品质合格数量") + private Long qualityQualifiedNum; + + /** 品质不合格数量 */ + @Excel(name = "品质不合格数量") + private Long qualityUnqualifiedNum; + + /** 入库数量 */ + @Excel(name = "入库数量") + private Long storageNum; + + private List inboundDetails; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } - public void setMakeNo(String makeNo) + public void setQualityOrderCode(String qualityOrderCode) + { + this.qualityOrderCode = qualityOrderCode; + } + + public String getQualityOrderCode() + { + return qualityOrderCode; + } + public void setMakeNo(String makeNo) { this.makeNo = makeNo; } - public String getMakeNo() + public String getMakeNo() { return makeNo; } - public void setSaleNo(String saleNo) + public void setQualityStatus(String qualityStatus) + { + this.qualityStatus = qualityStatus; + } + + public String getQualityStatus() + { + return qualityStatus; + } + public void setSaleNo(String saleNo) { this.saleNo = saleNo; } - public String getSaleNo() + public String getSaleNo() { return saleNo; } - public void setInboundOrderNo(String inboundOrderNo) + public void setInboundOrderNo(String inboundOrderNo) { this.inboundOrderNo = inboundOrderNo; } - public String getInboundOrderNo() + public String getInboundOrderNo() { return inboundOrderNo; } - public void setInboundStatus(String inboundStatus) + public void setInboundStatus(String inboundStatus) { this.inboundStatus = inboundStatus; } - public String getInboundStatus() + public String getInboundStatus() { return inboundStatus; } - public void setInboundType(String inboundType) + public void setInboundType(String inboundType) { this.inboundType = inboundType; } - public String getInboundType() + public String getInboundType() { return inboundType; } - public void setInboundNum(Long inboundNum) + public void setInboundNum(Long inboundNum) { this.inboundNum = inboundNum; } - public Long getInboundNum() + public Long getInboundNum() { return inboundNum; } + public void setEngineerName(String engineerName) + { + this.engineerName = engineerName; + } + + public String getEngineerName() + { + return engineerName; + } + public void setOrderType(String orderType) + { + this.orderType = orderType; + } + + public String getOrderType() + { + return orderType; + } + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + public void setSalesOrderNumber(String salesOrderNumber) + { + this.salesOrderNumber = salesOrderNumber; + } + + public String getSalesOrderNumber() + { + return salesOrderNumber; + } + public void setMaterialTotal(Long materialTotal) + { + this.materialTotal = materialTotal; + } + + public Long getMaterialTotal() + { + return materialTotal; + } + public void setNumTotal(Long numTotal) + { + this.numTotal = numTotal; + } + + public Long getNumTotal() + { + return numTotal; + } + public void setQualityQualifiedNum(Long qualityQualifiedNum) + { + this.qualityQualifiedNum = qualityQualifiedNum; + } + + public Long getQualityQualifiedNum() + { + return qualityQualifiedNum; + } + public void setQualityUnqualifiedNum(Long qualityUnqualifiedNum) + { + this.qualityUnqualifiedNum = qualityUnqualifiedNum; + } + + public Long getQualityUnqualifiedNum() + { + return qualityUnqualifiedNum; + } + public void setStorageNum(Long storageNum) + { + this.storageNum = storageNum; + } + + public Long getStorageNum() + { + return storageNum; + } public List getInboundDetails() { return inboundDetails; @@ -133,19 +290,32 @@ public class ErpInboundOrder extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("makeNo", getMakeNo()) - .append("saleNo", getSaleNo()) - .append("inboundOrderNo", getInboundOrderNo()) - .append("inboundStatus", getInboundStatus()) - .append("inboundType", getInboundType()) - .append("inboundNum", getInboundNum()) - .toString(); + .append("id", getId()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("qualityOrderCode", getQualityOrderCode()) + .append("makeNo", getMakeNo()) + .append("qualityStatus", getQualityStatus()) + .append("saleNo", getSaleNo()) + .append("inboundOrderNo", getInboundOrderNo()) + .append("inboundStatus", getInboundStatus()) + .append("inboundType", getInboundType()) + .append("inboundNum", getInboundNum()) + .append("engineerName", getEngineerName()) + .append("orderType", getOrderType()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("salesOrderNumber", getSalesOrderNumber()) + .append("materialTotal", getMaterialTotal()) + .append("numTotal", getNumTotal()) + .append("qualityQualifiedNum", getQualityQualifiedNum()) + .append("qualityUnqualifiedNum", getQualityUnqualifiedNum()) + .append("storageNum", getStorageNum()) + .append("inboundDetails",getInboundDetails()) + .toString(); } } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml index 44430a97..ff86128b 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,35 +12,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + - select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.make_no, a.sale_no, a.inbound_order_no, a.inbound_status, a.inbound_type, a.inbound_num from erp_inbound_order a + select + a.id, + a.del_flag, + a.create_by, + a.create_time, + a.update_by, + a.update_time, + a.remark, + a.quality_order_code, + a.make_no, + a.quality_status, + a.sale_no, + a.inbound_order_no, + a.inbound_status, + a.inbound_type, + a.inbound_num, + a.engineer_name, + a.order_type, + a.customer_id, + a.customer_name, + a.sales_order_number, + a.material_total, + a.num_total, + a.quality_qualified_num, + a.quality_unqualified_num, + a.storage_num + from erp_inbound_order a - + - + insert into erp_inbound_order @@ -51,12 +90,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, remark, make_no, + quality_order_code, + quality_status, sale_no, inbound_order_no, inbound_status, inbound_type, inbound_num, - + engineer_name, + order_type, + customer_id, + customer_name, + sales_order_number, + material_total, + num_total, + quality_qualified_num, + quality_unqualified_num, + storage_num, + #{delFlag}, #{createBy}, @@ -65,12 +116,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{remark}, #{makeNo}, + #{qualityOrderCode}, + #{qualityStatus}, #{saleNo}, #{inboundOrderNo}, #{inboundStatus}, #{inboundType}, #{inboundNum}, - + #{engineerName}, + #{orderType}, + #{customerId}, + #{customerName}, + #{salesOrderNumber}, + #{materialTotal}, + #{numTotal}, + #{qualityQualifiedNum}, + #{qualityUnqualifiedNum}, + #{storageNum}, + @@ -83,11 +146,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, remark = #{remark}, make_no = #{makeNo}, + quality_order_code = #{qualityOrderCode}, + quality_status = #{qualityStatus}, sale_no = #{saleNo}, inbound_order_no = #{inboundOrderNo}, inbound_status = #{inboundStatus}, inbound_type = #{inboundType}, inbound_num = #{inboundNum}, + engineer_name = #{engineerName}, + order_type = #{orderType}, + customer_id = #{customerId}, + customer_name = #{customerName}, + sales_order_number = #{salesOrderNumber}, + material_total = #{materialTotal}, + num_total = #{numTotal}, + quality_qualified_num = #{qualityQualifiedNum}, + quality_unqualified_num = #{qualityUnqualifiedNum}, + storage_num = #{storageNum}, where id = #{id} @@ -97,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from erp_inbound_order where id in + delete from erp_inbound_order where id in #{id} @@ -111,4 +186,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update erp_inbound_order set del_flag = '0' where id = #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html index 670d4429..068f1812 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html @@ -11,34 +11,19 @@
  • - - -
    • -
  • - +
  • - - -
    • -
  • - - -
    • -
  • - -
  • - - + +
  • @@ -48,19 +33,27 @@
  • - -
  • - +
    • +
  • + + +
    • +
  • + + +
  • @@ -103,6 +96,10 @@ var restoreFlag = [[${@permission.hasPermi('erp:inboundOrder:restore')}]]; var inboundStatusDatas = [[${@dict.getType('erp_inbound_status')}]]; var inboundTypeDatas = [[${@dict.getType('erp_inbound_type')}]]; + + var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]]; + var orderTypeDatas = [[${@dict.getType('sys_order_type')}]]; + var prefix = ctx + "erp/inboundOrder"; $(function() { @@ -119,8 +116,21 @@ columns: [ {checkbox: true}, {title: '主键ID',field: 'id',visible: false}, - {title: '品质单号',field: ''}, - {title: '品质状态',field: '',}, + { + title: '品质单号', + field: 'qualityOrderCode', + }, + { + title: '生产订单号', + field: 'makeNo', + }, + { + title: '仓库品质状态', + field: 'warehouseQualityStatus', + formatter: function(value, row, index) { + return $.table.selectDictLabel(warehouseQualityStatusDatas, value); + } + }, {title: '入库状态',field: 'inboundStatus', formatter: function(value, row, index) { return $.table.selectDictLabel(inboundStatusDatas, value); @@ -129,21 +139,56 @@ {title: '入库单号',field: 'inboundOrderNo',}, {title: '关联生产订单号',field: 'makeNo',}, {title: '关联销售订单号',field: 'saleNo',visible: false,}, - {title: '生产订单类型',field: '',}, + { + title: '工程员', + field: 'engineerName', + }, + {title: '生产订单类型',field: 'orderType', + formatter: function(value, row, index) { + return $.table.selectDictLabel(orderTypeDatas, value); + } + }, {title: '入库类型',field: 'inboundType', formatter: function(value, row, index) { return $.table.selectDictLabel(inboundTypeDatas, value); } }, - {title: '客户ID',field: '',}, - {title: '客户公司名称',field: '',}, - {title: '客户订单号',field: '',}, - {title: '物料合计',field: '',}, - {title: '数量合计',field: '',}, - {title: '委内加工费总价',field: '',}, - {title: '品质合格数',field: '',}, - {title: '品项不合格数',field: '',}, - {title: '入库数',field: 'inboundNum',}, + { + title: '客户Id', + field: 'customerId', + }, + { + title: '客户公司名称', + field: 'customerName', + }, + { + title: '客户订单号', + field: 'salesOrderNumber', + }, + { + title: '物料合计', + field: 'materialTotal', + }, + { + title: '数量合计', + field: 'numTotal', + }, + { + title: '委内加工费总价', + field: 'numTotal', + }, + { + title: '品质合格数量', + field: 'qualityQualifiedNum', + }, + { + title: '品质不合格数量', + field: 'qualityUnqualifiedNum', + }, + { + title: '入库数量', + field: 'storageNum', + }, {title: '录入人',field: 'inboundUser',}, {title: '录入时间',field: 'inboundTime',}, {title: '更新人',field: '',},