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 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+