From dc132e6f12a0d96b763c9fda4773e7d59435c572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Sat, 16 Nov 2024 09:46:07 +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?=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AD=90=E8=A1=A8=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=AD=98=E5=82=A8=E8=A1=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=89=8D=E5=B0=86=E8=BE=93=E5=85=A5=E6=A1=86=E5=80=BC?= =?UTF-8?q?=E8=B5=8B=E7=BB=99=E8=A1=8C=E5=AF=B9=E8=B1=A1=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8F=90=E4=BA=A4=E5=87=BD=E6=95=B0=EF=BC=8C=E9=81=8D?= =?UTF-8?q?=E5=8E=86=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BA=93=E6=95=B0=E5=AD=98=E5=9C=A8=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=9D=A1=E4=BB=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/makeorder/addProduceInbound.html | 2 +- .../resources/templates/system/makeorder/addpick.html | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html index 57775430..6d5f8435 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html @@ -507,7 +507,7 @@ tableData.push(row); hasValue = true; } - }else if(row.currentNum!=0){ + }else if(row.currentNum && row.currentNum!=0){ tableData.push(row); hasValue = true; } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html index ce6c3bb8..cfd45f8c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html @@ -377,11 +377,11 @@ // 当所有数据被加载时触发 onLoadSuccess: function(data) { var childRows = data.rows; - if(childRows[0].orderNum == 0||childRows[0].orderNum == null){ - childRows.forEach(function(row) { + childRows.forEach(function(row) { + if(row.orderNum == 0||row.orderNum == null){ row.orderNum = parentRow.orderNum * row.useNum; - }); - } + } + }); childRows.forEach(function (materialData){ var key = childTableId + '_' + materialData.materialNo; var curIndex = materialData.sortNo -1; @@ -390,6 +390,7 @@ var pickDetail = JSON.parse(pick); $("#"+childTableId+curIndex).val(pickDetail.pickNum); }else{ + materialData.pickNum = $("#"+childTableId+curIndex).val(); sessionStorage.setItem(key,JSON.stringify(materialData)); } }) @@ -502,7 +503,7 @@ } data.pickDetails = pickDetails; console.log(data); - $.operate.saveJson(ctx + "system/makeorderpick/ad", JSON.stringify(data)); + $.operate.saveJson(ctx + "system/makeorderpick/add", JSON.stringify(data)); }