From 31a0849168b91ffff5536f9ab792cded1d56e732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Fri, 27 Dec 2024 10:14:21 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=9F=E4=BA=A7bom=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=EF=BC=8C=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E5=88=A4=E9=87=8D=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=9B=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8F=92=E5=85=A5=E7=89=A9=E6=96=99=E6=96=B0=E8=A1=8C?=
 =?UTF-8?q?=E5=88=B0=E8=A1=A8=E6=A0=BC=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/makeorder/editMakeOrderBom.html    | 81 ++++++++++++-------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
index 77f767f3..08a46a6e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
@@ -362,41 +362,62 @@
     }
     function doSubmit(index, layero,uniqueId){
         var iframeWin = window[layero.find('iframe')[0]['name']];
-        var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0];
-        var rows = $("#bootstrap-sub-table-1").bootstrapTable('getData').length;
-        if($("#materialNo").val()==rowData.materialNo){
-            $.modal.alertError("不能选择与主体bom相同的料号");
+        var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections');
+
+        if (rowData.length === 0) {
+            $.modal.alertError("请选择至少一条物料信息");
             return;
         }
-        for(var i=0;i<rows;i++){
-            var data = $("#bootstrap-sub-table-1").bootstrapTable('getData')[i];
-            if(data.materialNo==rowData.materialNo){
-                $.modal.alertError("不能选择已添加过的相同料号");
-                return;
-            }
+        var materialNo = $("#materialNo").val();
+        //判断是否重复
+        var data = $("#bootstrap-sub-table-1").bootstrapTable('getData');
+        var isDuplicate = false;
+        var rows = data.length;
+        if(rows>0){
+            for(var j=0;j<rowData.length;j++){
+                if(rowData[j].materialNo == materialNo){
+                    isDuplicate = true;
+                    break;
+                }
+                for(var i=0;i<rows;i++){
+                    if(data[i].materialNo===rowData[j].materialNo){
+                        $.modal.alertError("物料"+data[i].materialNo+"已添加");
+                        rowData.split(j,1);
+                        break;
+                    }
+                }
+            };
+        }
+        if(isDuplicate){
+            $.modal.alertError("不能选择与主体物料相同的物料");
+            return;
+        }
+        for(i=0;i<rowData.length;i++){
+            insertTable(rowData[i]);
         }
-        var timestamp = new Date().getTime();
-        var totalNum = $("#bootstrap-sub-table-1").bootstrapTable('getData').length;
-        $("#bootstrap-sub-table-1").bootstrapTable('insertRow', {
-            index:totalNum,
-            replace:true,
-            row: {
-                bomId:rowData.subId,
-                materialNo: rowData.materialNo,
-                bomNo: rowData.bomNo,
-                level: "1",
-                materialName: rowData.materialName,
-                materialType: rowData.materialType,
-                describe: rowData.describe,
-                materialModel:rowData.materialModel,
-                brand: rowData.brand,
-                unit: rowData.unit,
-                processMethod: rowData.processMethod,
-                warehouseDept: rowData.warehouseDept,
-            }
-        })
         layer.close(index);
     }
+    /*新增物料插入表格*/
+    function insertTable(rowData){
+        var newRow = {
+            id: rowData.id,
+            bomNo: rowData.bomNo,
+            materialNo: rowData.materialNo,
+            materialName: rowData.materialName,
+            materialType: rowData.materialType,
+            describe: rowData.describe,
+            processMethod: rowData.processMethod,
+            unit: rowData.unit,
+            materialModel: rowData.materialModel,
+            brand: rowData.brand,
+            warehouseDept: rowData.warehouseDept,
+            fileCode: rowData.fileCode,
+            level: "1",
+            useNum: '',
+            lossRate: ''
+        };
+        $("#bootstrap-sub-table-1").bootstrapTable("append",newRow);
+    }
     /* 新增表格行 */
     function insertRow(){
         // var uuidStr = uuid();