From c8526a573d8dfa5ee798c110b75b155b29ffba5b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 4 Nov 2024 14:05:57 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9A=E6=9C=AC=E6=AC=A1=E6=94=B6=E8=B4=A7=E6=95=B0=E3=80=81?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E8=B4=A7=E6=95=B0=E3=80=81=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87id=E3=80=81SN=E7=A0=81=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85mapper.xml=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AthisReceivingNum=E3=80=81hasReceivin?= =?UTF-8?q?gNum=E3=80=81shippingDeviceId=E3=80=81snCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysSalesOrder.java | 2 +- .../domain/SysSalesShippingInformDetail.java | 53 ++++++++++++++++++- .../SysSalesShippingInformDetailMapper.xml | 22 +++++++- .../system/salesOrder/salesDeliverGoods.html | 14 ++--- 4 files changed, 78 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index 45b2989e..82b8d3c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -38,7 +38,7 @@ public class SysSalesOrder extends BaseEntity { @Excel(name = "收款结案状态", dictType = "sys_close_status") private String closeStatus; - /**生产状态(0待评审、1待部门主管确认、2待工程审核、3待生产、4生产中、5部分完成、6全部完成)*/ + /**生产状态(0待评审、1待部门主管确认、2待工程审核、3待生产、4生产中、5部分完成、6全部完成、7采购审核)*/ @Excel(name = "生产状态", dictType = "sys_erp_makeStatus") private String makeStatus; /* 订单编号*/ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java index 389a561b..86c1fc3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesShippingInformDetail.java @@ -72,8 +72,8 @@ public class SysSalesShippingInformDetail extends BaseEntity @Excel(name = "订单数",isStatistics = true) private Integer makeNum; - /** 申请出货数 */ - @Excel(name = "申请出货数",isStatistics = true) + /** 本次出货数 */ + @Excel(name = "本次出货数",isStatistics = true) private Integer thisShippingNum; /** 已出库数 */ @@ -96,6 +96,18 @@ public class SysSalesShippingInformDetail extends BaseEntity @Excel(name = "已完成数",isStatistics = true) private Integer hasCompleteNum; + /** 本次收货数 */ + private Integer thisReceivingNum; + + /** 已收货数 */ + private Integer hasReceivingNum; + + /** 出货设备ID */ + private String shippingDeviceId; + + + /** SN码 */ + private String snCode; public void setShippingInformDetailId(Long shippingInformDetailId) { @@ -286,6 +298,39 @@ public class SysSalesShippingInformDetail extends BaseEntity this.hasCompleteNum = hasCompleteNum; } + + public Integer getThisReceivingNum() { + return thisReceivingNum; + } + + public void setThisReceivingNum(Integer thisReceivingNum) { + this.thisReceivingNum = thisReceivingNum; + } + + public Integer getHasReceivingNum() { + return hasReceivingNum; + } + + public void setHasReceivingNum(Integer hasReceivingNum) { + this.hasReceivingNum = hasReceivingNum; + } + + public String getShippingDeviceId() { + return shippingDeviceId; + } + + public void setShippingDeviceId(String shippingDeviceId) { + this.shippingDeviceId = shippingDeviceId; + } + + public String getSnCode() { + return snCode; + } + + public void setSnCode(String snCode) { + this.snCode = snCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -310,6 +355,10 @@ public class SysSalesShippingInformDetail extends BaseEntity .append("hasCheckNum", getHasCheckNum()) .append("hasShippingNum", getHasShippingNum()) .append("hasCompleteNum", getHasCompleteNum()) + .append("thisReceivingNum", getThisReceivingNum()) + .append("hasReceivingNum", getHasReceivingNum()) + .append("shippingDeviceId", getShippingDeviceId()) + .append("snCode", getSnCode()) .append("createTime", getCreateTime()) .append("createBy", getCreateBy()) .append("updateBy", getUpdateBy()) diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml index 8ced8570..a321263c 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml @@ -24,8 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -34,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, has_shipping_num, has_complete_num ,create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail + select shipping_inform_detail_id, out_order_code, customer_id, customer_name, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, make_num, this_shipping_num, has_out_order_num, this_check_num, has_check_num, has_shipping_num, has_complete_num, this_receiving_num, has_receiving_num,sn_code, shipping_device_id,create_time, create_by, update_by, update_time, remark from sys_sales_shipping_inform_detail - - - - - - - - -
@@ -147,6 +138,7 @@ "materialType": item.materialType, "describe": item.describe, "unit": item.unit, + "materialModel": item.materialModel, "brand": item.brand, "processMethod": item.processMethod, "materialNum": item.materialNum, @@ -339,6 +331,10 @@ title: '单位', field: 'unit', }, + { + title: '型号', + field: 'materialModel', + }, { title: '品牌', field: 'brand',