From f041ccd30bb568d251b969d7c5ec76e736e6436d Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 5 Jul 2024 20:10:35 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=89=A9=E6=96=99=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E6=80=BB=E7=9B=91=E5=AE=A1=E6=A0=B8=E6=B8=85=E9=99=A4var=20erp?=
 =?UTF-8?q?Material=20=3D=20[[${formData}]];=20js=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java  | 2 +-
 .../src/main/resources/templates/erp/bom/taskYfzjVerify.html   | 3 ---
 .../main/resources/templates/erp/material/taskYfzjVerify.html  | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
index 943c113c..5bbdc3c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
@@ -393,7 +393,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
                 warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
                result = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
             }
-            if(list2.size()>0) {
+            if(list2.size() > 0) {
                 String warehouseStorageCode1 = redisCache.generateBillNo("RK");
                 //入库部门类型：采购入库单
                 for (WarehouseStorageOrderDetail warehouseStorageOrderDetail: list2) {
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
index 2a544e63..be95f385 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
@@ -249,9 +249,6 @@
     $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
-            $("#selectMaterialType").removeAttr("disabled");
-            $("#selectProcessMethod").removeAttr("disabled");
-            $("#selectUnit").removeAttr("disabled");
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             if ($('textarea[name="comment"]').val()) {
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
index e0be1cee..09e05ad8 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
@@ -253,7 +253,6 @@
             },
         }
     })
-    var erpMaterial = [[${formData}]];
     var prefix = ctx + "erp/material";
     $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {