From 73b65103427d046017ec3b0e28b6fb90eafa85b4 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 27 Nov 2024 17:03:41 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E9=80=9A=E7=9F=A5=E5=88=B0=E8=B4=A7=E6=95=B0=E5=8A=A0?=
=?UTF-8?q?=E4=B8=8A4=E4=B8=AA=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A6=82=E6=9E=9C=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E6=9C=89=E9=94=81=E6=9C=BA=E4=B8=BA=E5=90=A6=EF=BC=8C=E5=88=99?=
=?UTF-8?q?=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E6=8F=90=E7=A4=BA=E4=B8=8D?=
=?UTF-8?q?=E5=8F=AF=E9=94=81=E6=9C=BA=EF=BC=9B=E5=A6=82=E6=9E=9C=E4=B8=BA?=
=?UTF-8?q?=E6=98=AF=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=A1=AB=E5=86=99=E9=94=81?=
=?UTF-8?q?=E6=9C=BA=E6=97=B6=E9=97=B4=EF=BC=9B=20=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E5=8D=95-=E5=87=BA=E5=BA=93=E5=89=8D=E7=AB=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=85=B6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=92=8C?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5=EF=BC=8C?=
=?UTF-8?q?=E5=85=B6=E4=BB=96=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
=?UTF-8?q?=E5=8F=AA=E8=AF=BB=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=9A=84=E4=BD=BF=E7=94=A8=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E3=80=81=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E3=80=81?=
=?UTF-8?q?=E5=87=BA=E8=B4=A7=E7=8A=B6=E6=80=81=E3=80=81=E6=94=B6=E6=AC=BE?=
=?UTF-8?q?=E7=BB=93=E6=A1=88=E7=8A=B6=E6=80=81=E9=83=BD=E5=8A=A0=E4=B8=8A?=
=?UTF-8?q?=E5=A4=87=E6=B3=A8=20=E4=BF=AE=E5=A4=8D=E6=A0=B9=E6=8D=AE?=
=?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E5=92=8C=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE=E5=8D=95=E5=AD=90?=
=?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruoyi/system/domain/SysSalesOrder.java | 8 +++----
.../system/SysSalesOrderChildMapper.xml | 2 +-
.../maintenanceEquipmentTwo.html | 11 ++++++++-
.../purchaseOrder/addPurchaseStorage.html | 2 +-
.../warehouseOutOrder/salesOutWarehouse.html | 24 +++++++++----------
.../salesOutWarehouseDetail.html | 24 +++++++++----------
6 files changed, 40 insertions(+), 31 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 bf9512ac..39fbcca1 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
@@ -22,19 +22,19 @@ public class SysSalesOrder extends BaseEntity {
/* 订单id*/
private Long salesOrderId;
- /*使用状态 0未使用，1使用，2已作废*/
+ /** 使用状态 0未使用，1使用，2已作废*/
@Excel(name = "使用状态", dictType = "useStatus")
private String useStatus;
- /*审核状态 (0未审核，1审核通过，2审核拒绝)*/
+ /** 审核状态 (0未审核，1审核通过，2审核拒绝)*/
@Excel(name = "审核状态", dictType = "auditStatus")
private String auditStatus;
- /*出货状态（0待出货通知,1待准备货,2待出货,3部分收货,4全部收货,5部分出货,6全部出货,7部分验收,8全部验收)*/
+ /** 出货状态（0待出货通知,1待准备货,2待出货,3部分收货,4全部收货,5部分出货,6全部出货,7部分验收,8全部验收)*/
@Excel(name = "出货状态", dictType = "sys_delivery_status")
private String deliveryStatus;
- /*收款结案状态（0待收款，1部分收款，2全部收款，3已结案)*/
+ /** 收款结案状态（0待收款，1部分收款，2全部收款，3已结案)*/
@Excel(name = "收款结案状态", dictType = "sys_close_status")
private String closeStatus;
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index ee64769f..30dbb9fd 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -289,7 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
materialName = #{materialName},
materialType = #{materialType},
processMethod = #{processMethod},
- materialModel = #{materialModel},
+ material_model = #{materialModel},
brand = #{brand},
photoUrl = #{photoUrl},
unit = #{unit},
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
index aa398156..e113491f 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
@@ -344,8 +344,17 @@
editable:{
type:'date',
title: '锁机时间',
- clear: false,//隐藏clear按钮
placement: 'center',//居中显示
+ clear: false,//隐藏clear按钮
+ //动态禁用行内编辑
+ noEditFormatter: function(value, row, index){
+ if (row.lockDateFlag === "1"){
+ return "不可锁机";
+ }else {
+ return false;
+ }
+ },
+
}
},
{
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
index bddec91a..dbab8cb3 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html
@@ -243,7 +243,7 @@
}
//不能为小数
if (value % 1 !== 0) {
- return '本次验收数不能为小数';
+ return '通知到货数不能为小数';
}
},
},
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
index 5ae2185c..1e24df69 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
@@ -22,24 +22,24 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+