From 814a6f8243e2fc399458fdabe77f8e6228a3451f Mon Sep 17 00:00:00 2001 From: weizhiqiang <> Date: Fri, 21 Oct 2022 10:31:59 +0800 Subject: [PATCH] =?UTF-8?q?ERP=E5=95=86=E5=93=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/template/js/erpBom/erpBomAdd.js | 2 +- .../main/resources/template/js/erpBom/erpBomEdit.js | 7 +++---- .../main/resources/template/js/erpBom/erpBomList.js | 6 +++--- .../resources/template/js/erpMachin/erpMachinAdd.js | 4 ++-- .../resources/template/js/erpMachin/erpMachinEdit.js | 10 +++++----- .../main/resources/template/js/erpPick/erpPatchAdd.js | 4 ++-- .../main/resources/template/js/erpPick/erpPatchEdit.js | 4 ++-- .../resources/template/js/erpPick/erpRequisitionAdd.js | 4 ++-- .../template/js/erpPick/erpRequisitionEdit.js | 4 ++-- .../main/resources/template/js/erpPick/erpReturnAdd.js | 4 ++-- .../resources/template/js/erpPick/erpReturnEdit.js | 4 ++-- .../template/js/erpProduction/erpProductionEdit.js | 2 +- .../resources/template/tpl/erpBom/erpBomDetail.html | 7 ++++--- .../template/tpl/erpMachin/erpMachinDetails.html | 6 +++--- .../resources/template/js/allocation/allocationadd.js | 2 +- .../resources/template/js/allocation/allocationedit.js | 2 +- .../template/js/assemblysheet/assemblysheetadd.js | 2 +- .../template/js/assemblysheet/assemblysheetedit.js | 2 +- .../template/js/material/materialChooseToProduce.js | 2 +- .../template/js/otheroutlets/otheroutletsadd.js | 2 +- .../template/js/otheroutlets/otheroutletsedit.js | 2 +- .../template/js/otherwarehous/otherwarehousadd.js | 2 +- .../template/js/otherwarehous/otherwarehousedit.js | 2 +- .../template/js/purchaseorder/purchaseorderadd.js | 2 +- .../template/js/purchaseorder/purchaseorderedit.js | 2 +- .../template/js/purchaseorder/purchaseorderpurchase.js | 2 +- .../template/js/purchaseput/purchaseputadd.js | 2 +- .../template/js/purchaseput/purchaseputedit.js | 2 +- .../template/js/purchasereturns/purchasereturnsadd.js | 2 +- .../template/js/purchasereturns/purchasereturnsedit.js | 2 +- .../template/js/retailoutlet/retailoutletadd.js | 2 +- .../template/js/retailoutlet/retailoutletedit.js | 2 +- .../template/js/retailreturns/retailreturnsadd.js | 2 +- .../template/js/retailreturns/retailreturnsedit.js | 2 +- .../resources/template/js/salesorder/salesorderadd.js | 2 +- .../resources/template/js/salesorder/salesorderedit.js | 2 +- .../template/js/salesorder/salesorderpurchase.js | 2 +- .../template/js/salesoutlet/salesoutletadd.js | 2 +- .../template/js/salesoutlet/salesoutletedit.js | 2 +- .../template/js/salesreturns/salesreturnsadd.js | 2 +- .../template/js/salesreturns/salesreturnsedit.js | 2 +- .../resources/template/js/splitlist/splitlistadd.js | 2 +- .../resources/template/js/splitlist/splitlistedit.js | 2 +- .../resources/template/js/partsclaim/partsclaimadd.js | 4 ++-- .../resources/template/js/partsclaim/partsclaimedit.js | 4 ++-- .../js/stateisstayfinishedpro/stateisstayfinished.js | 4 ++-- 46 files changed, 69 insertions(+), 69 deletions(-) diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js index 49ae66c9d..8d4c7b3df 100644 --- a/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js +++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js @@ -81,7 +81,7 @@ layui.config({ } }); if(unitIndex >= 0){ - return unitList[unitIndex].salePrice; + return unitList[unitIndex].normsSalePrice; } } diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js index 22efbd620..73d9eeebf 100644 --- a/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js +++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js @@ -22,7 +22,7 @@ layui.config({ var selTemplate = getFileContent('tpl/template/select-option-must.tpl'); - AjaxPostUtil.request({url: flowableBasePath + "erpbom005", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function (json) { + AjaxPostUtil.request({url: flowableBasePath + "erpbom005", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function (json) { $("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json)); textool.init({eleId: 'remark', maxlength: 200}); @@ -103,7 +103,7 @@ layui.config({ } }); if(unitIndex >= 0){ - return unitList[unitIndex].salePrice; + return unitList[unitIndex].normsSalePrice; } } @@ -319,8 +319,7 @@ layui.config({ var str = ""; var title = ""; $.each(procedureMationList, function(i, item) { - str += '' + - '' + item.number + '' + item.procedureName + '，'; + str += '' + item.number + '' + item.procedureName + '，'; title += item.number + '、' + item.procedureName + '\n'; }); $("#procedureBox" + proId).html('' + str); diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js index 77a10a587..edb8a9303 100644 --- a/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js +++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js @@ -28,9 +28,9 @@ layui.config({ { field: 'title', title: 'bom方案名称', align: 'left',width: 150, templet: function (d) { return '' + d.title + ''; }}, - { field: 'materialName', title: '商品名称', align: 'left',width: 150 }, - { field: 'materialModel', title: '商品型号', align: 'left',width: 150 }, - { field: 'unitName', title: '计量单位', align: 'center',width: 100 }, + { field: 'materialName', title: '商品名称', align: 'left',width: 150, templet: function (d) {return d.normMation.materialName}}, + { field: 'materialModel', title: '商品型号', align: 'left',width: 150, templet: function (d) {return d.normMation.materialModel}}, + { field: 'unitName', title: '计量单位', align: 'center',width: 100, templet: function (d) {return d.normMation.unitName}}, { field: 'makeNum', title: '数量', align: 'center',width: 80 }, { field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100 }, { field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100 }, diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js index 85b026cb4..4f2ea00af 100644 --- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js +++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js @@ -58,8 +58,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js index b23392e16..93f1edaf1 100644 --- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js +++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js @@ -60,9 +60,9 @@ layui.config({ //加工产品信息 machinPro = { materialId: data.materialId, - materialName: data.materialName, - materialModel: data.materialModel, - unitList: data.unitList + materialName: data.normMation.materialName, + materialModel: data.normMation.materialModel, + unitList: data.normMation.unitList }; $("#productName").val(machinPro.materialName); $("#productModel").val(machinPro.materialModel); @@ -126,8 +126,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js index 5c52c78d3..15ad1e324 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js @@ -49,8 +49,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js index a23ea3c5d..fa20577ef 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js @@ -84,8 +84,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js index 9a2110d05..1f9c0615b 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js @@ -49,8 +49,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js index 53dabec8f..161865d34 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js @@ -94,8 +94,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js index 35600dcba..c6835c54c 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js @@ -45,8 +45,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js index ca548dc54..4bcd5e917 100644 --- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js +++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js @@ -75,8 +75,8 @@ layui.config({ if(thisRowValue == bean.id){//获取规格 //获取当前行数量 var rkNum = parseInt($("#rkNum" + thisRowNum).val()); - $("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价 - $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额 + $("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价 + $("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额 return false; } }); diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js index fcb70e7d2..cac7e7b47 100644 --- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js +++ b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js @@ -186,7 +186,7 @@ layui.config({ normsId: item.normsId, number: $("#proposal" + item.materialId).val(), unitNumber: item.needNum, - unitPrice: item.normsPurchasePrice + unitPrice: item.normsEstimatePurchasePrice }); }); //子件清单信息 diff --git a/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html b/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html index c5f3f9408..653ceb799 100644 --- a/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html +++ b/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html @@ -56,19 +56,19 @@
- {{materialName}} + {{normMation.materialName}}
- {{materialModel}} + {{normMation.materialModel}}
- {{unitName}} + {{normMation.unitName}}
@@ -133,6 +133,7 @@