From d21444dac4c6f839a9eab4ed86dd2b084a73331c 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, 23 Aug 2024 16:07:17 +0800
Subject: [PATCH 1/8] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=88=97=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E5=88=97=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E9=80=80=E8=BF=98=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B7=B3=E8=BD=AC=E6=96=B9=E6=B3=95=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=80=80=E6=8D=A2=E8=B4=A7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=88=97=E5=90=8D=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=88=97=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=E5=AE=9A=E4=B9=89=EF=BC=9B=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=84=E7=90=86=E5=93=81=E8=B4=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=AD=90=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=EF=BC=9B=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8C=89=E6=96=99=E5=8F=B7=E6=9F=A5=E6=89=BE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=9A=84=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E8=AF=A5?=
 =?UTF-8?q?=E6=96=99=E5=8F=B7=E5=AF=B9=E5=BA=94session=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=80=E6=8D=A2=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=96=B9=E6=B3=95=EF=BC=8C=E5=BE=AA=E7=8E=AF=E5=AD=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E9=99=84=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=B8=8A=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A7=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=AF=BB=E5=8F=96session=E4=B8=AD?=
 =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=96=99=E5=8F=B7key=E5=80=BC=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/refundsExchanges/add.html         | 125 ++++++++++++++++--
 .../refundsExchanges/materialSelect.html      |  24 +++-
 .../refundsExchanges/qualityOrderReport.html  |  60 ++++++---
 .../refundsExchanges/refundsExchanges.html    |  51 +++----
 .../returnAfterStorageDetail.html             |  44 +++++-
 5 files changed, 239 insertions(+), 65 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
index 5cceb476..329cebf5 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
@@ -46,8 +46,9 @@
     <script th:inline="javascript">
         var prefix = ctx + "quality/refundsExchanges"
         var refundsExchangesCode  = /*[[${refundsExchangesCode}]]*/ '';
-
-
+        var processMethodDatas = [[${@dict.getType('processMethod')}]];
+        var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+        var materialUnqualifiedList = [];
         $("#form-refundsExchanges-add").validate({
             focusCleanup: true
         });
@@ -85,6 +86,14 @@
                 };
             });
 
+            materialDataList.forEach(function (material){
+                var key = 'unqualifiedDataList' + material.materialNo;
+                var dataString = sessionStorage.getItem(key);
+                if(dataString){
+                    var refundsExchangesUnqualifieds = JSON.parse(dataString);
+                    material.refundsExchangesUnqualifieds = refundsExchangesUnqualifieds;
+                }
+            })
             // 将全局变量 refundsExchangesCode 添加到要提交的数据中
             const combinedData = Object.assign({}, refundsExchangesData, {
                 refundsExchangesDetails: materialDataList,
@@ -132,6 +141,9 @@
                     {
                         title: '图片',
                         field: 'materialPhotourl',
+                        formatter: function(value, row, index) {
+                            return $.table.imageView(value);
+                        }
                     },
                     {
                         title: '物料名称',
@@ -140,6 +152,9 @@
                     {
                         title: '物料类型',
                         field: 'materialType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectCategoryLabel(materialTypeDatas, value);
+                        }
                     },
                     {
                         title: '描述',
@@ -156,6 +171,9 @@
                     {
                         title: '物料加工方式',
                         field: 'materialProcessMethod',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(processMethodDatas, value);
+                        }
                     },
                     {
                         title: '品质报告',
@@ -163,7 +181,7 @@
                         formatter: function(value, row, index) {
                             // 这里直接使用row对象获取refundsExchangesCode，假设它是存在的
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + refundsExchangesCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + refundsExchangesCode + '\', \'' + row.hasQualifiedReport + '\')"><i class="fa fa-plus"></i>报告</a> ');
                             return actions.join('');
                         }
                     },
@@ -171,6 +189,11 @@
                         title: '退换数',
                         field: 'refundsExchangesNum',
                     },
+                    {
+                        title: '是否含品质报告数据',
+                        field: 'hasQuolifiedReport',
+                        visible: false,
+                    },
                     {
                         title: '操作',
                         align: 'center',
@@ -209,11 +232,13 @@
                     materialPhotourl:rowData.materialPhotourl,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
-                    materialDescribe: rowData.materialDescribe,
-                    materialBrand: rowData.materialBrand,
-                    materialUnit: rowData.materialUnit,
-                    materialProcessMethod: rowData.materialProcessMethod,
-                    makeTotal:rowData.makeTotal
+                    materialDescribe: rowData.describe,
+                    materialBrand: rowData.brand,
+                    materialUnit: rowData.unit,
+                    materialProcessMethod: rowData.processMethod,
+                    makeTotal:rowData.makeTotal,
+                    refundsExchangesNum: '',
+                    hasQualifiedReport: 0,
                 }
             })
             layer.close(index);
@@ -225,17 +250,97 @@
                 field: 'materialNo',
                 values: materialNo
             })
+            // 删除该物料品质报告数据
+            var key = 'unqualifiedDataList' + materialNo;
+            if (sessionStorage.getItem(key)) {
+                sessionStorage.removeItem(key);
+            }
+        }
+
+        // 按料号查找更新表格数据
+        function updateRowByMaterialNo(materialNo, newData) {
+            // 获取所有行的数据
+            var rows = $('#bootstrap-table').bootstrapTable('getData');
+            for (var i = 0; i < rows.length; i++) {
+                if (rows[i].materialNo === materialNo) {
+                    rows[i] = Object.assign({}, rows[i], newData); // 合并新旧数据
+                    console.log(rows[i]);
+                    $('#bootstrap-table').bootstrapTable('updateRow', {
+                        index: i,
+                        row: rows[i]
+                    });
+                }
+            }
         }
 
+        // 处理品质报告子页面数据
+        function handleQualityReportData(index, layero){
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            var materialNo = iframeWin.$('#materialNo').val();
+            var inspectionTime = iframeWin.$('input[name="inspectionTime"]').val();
+            var remark = iframeWin.$('#remark').val();
+            var refundsExchangesNum = 0;
+
+            var table = iframeWin.$('#bootstrap-unqualified-table').bootstrapTable('getData');
+            // 检查表格数据是否为空
+            if (table.length===0){
+                $.modal.alertWarning("请至少添加一条不合格数再保存!");
+                return;
+            }
+            // 将表数据转换成与qualityReportData格式一致的数组
+            var unqualifiedDataList = table.map(function(item) {
+                // 根据实际字段名调整
+                return {
+                    "qualityOrderReportId": item.qualityOrderReportId,
+                    "processBadClassification": item.processBadClassification,
+                    "processBadGrade": item.processBadGrade,
+                    "processBadNum": item.processBadNum,
+                    "unqualifiedReportUrl": item.unqualifiedReportUrl
+                    // ...其他字段
+                };
+            });
+            unqualifiedDataList.forEach(function (index){
+                index.inspectionTime = inspectionTime;
+                index.remark = remark;
+                processBadNum = Number(index.processBadNum);
+                if (!isNaN(processBadNum) ) {
+                    refundsExchangesNum += processBadNum;
+                }
+            })
+
+            var key = 'unqualifiedDataList' + materialNo;
+            if (sessionStorage.getItem(key)) {
+                sessionStorage.removeItem(key);
+            }
+            sessionStorage.setItem(key,JSON.stringify(unqualifiedDataList));
+            var newData = {
+                refundsExchangesNum: refundsExchangesNum,
+                hasQualifiedReport: '1'
+            };
+            updateRowByMaterialNo(materialNo,newData);
+            layer.close(index);
+        }
 
         /*品质报告*/
-        function qualityReport(materialNo, refundsExchangesCode) {
+        function qualityReport(materialNo, refundsExchangesCode, hasQualifiedReport) {
             var queryParams = new URLSearchParams();
             queryParams.append('materialNo', materialNo);
             queryParams.append('refundsExchangesCode', encodeURIComponent(refundsExchangesCode));
 
+            if(hasQualifiedReport === "0"){
+                // 删除该物料品质报告数据
+                var key = 'unqualifiedDataList' + materialNo;
+                if (sessionStorage.getItem(key)) {
+                    sessionStorage.removeItem(key);
+                }
+            }
             var url = ctx + 'quality/refundsExchanges/qualityReport?' + queryParams.toString();
-            $.modal.open("品质报告", url);
+            var options = {
+                title: '品质报告',
+                url: url,
+                callBack: handleQualityReportData
+            };
+            $.modal.openOptions(options);
         }
 
     </script>
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
index f6fa0d67..b752dc7a 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
@@ -16,6 +16,11 @@
     var prefix = ctx + "quality/refundsExchanges";
     // 从后端拿到传入的makeNo
     var makeNo = /*[[${makeNo}]]*/ '';
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
     $(function() {
         var options = {
             id: 'bootstrap-materialSelect-table',
@@ -38,6 +43,10 @@
                 {
                     title: '图片',
                     field: 'materialPhotourl',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value);
+                    }
+
                 },
                 {
                     title: '物料名称',
@@ -46,18 +55,27 @@
                 {
                     title: '类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '描述',
-                    field: 'materialDescribe',
+                    field: 'describe',
                 },
                 {
                     title: '品牌',
-                    field: 'materialBrand',
+                    field: 'brand',
                 },
                 {
                     title: '单位',
-                    field: 'materialUnit',
+                    field: 'unit',
+                },
+                {   title: '加工方式',
+                    field: 'processMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
             ]
         };
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
index b789d32e..1bb31d97 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
@@ -7,7 +7,7 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-qualityOrderReport-add">
-        <input name="materialNo" th:field="*{materialNo}" type="hidden">
+        <input name="materialNo" id="materialNo" th:field="*{materialNo}" type="hidden">
         <div class="container">
         <!--不合格数-->
             <div class="col-sm-12">
@@ -41,7 +41,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">备注：</label>
             <div class="col-sm-8">
-                <textarea name="remark" class="form-control" type="text"></textarea>
+                <textarea name="remark" id="remark" class="form-control" type="text"></textarea>
             </div>
         </div>
     </form>
@@ -52,7 +52,7 @@
 <script th:inline="javascript">
     var prefix = ctx + "quality/refundsExchanges";
 
-    var materialNo = /*[[${materialNo}]]*/'';
+    var materialNo = [[${materialNo}]];
     var refundsExchangesCode = /*[[${refundsExchangesCode}]]*/'';
 
 
@@ -77,7 +77,6 @@
             $.modal.alertWarning("请至少添加一条不合格数再保存!");
             return;
         }
-        console.log(JSON.stringify(table));
         // 将表数据转换成与qualityReportData格式一致的数组
         var unqualifiedDataList = table.map(function(item) {
             // 根据实际字段名调整
@@ -89,19 +88,25 @@
                 // ...其他字段
             };
         });
-
         const combinedData = Object.assign({}, qualityReportData, {
             refundsExchangesUnqualifieds: unqualifiedDataList ,
             materialNo:materialNo,
             refundsExchangesCode:refundsExchangesCode
         });
         // 合并表单数据和表格数据
-        // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
-        console.log(combinedData)
-        // 使用 JSON.stringify() 序列化数据
-        const jsonData = JSON.stringify(combinedData);
-        // 发送 AJAX 请求到后端接口
-        $.operate.saveJson(prefix + "/qualityReport", jsonData);
+        console.log(combinedData);
+
+        var key = 'unqualifiedDataList' + materialNo;
+        if (localStorage.getItem(key)) {
+            localStorage.removeItem(key);
+        }
+        localStorage.setItem(key,JSON.stringify(unqualifiedDataList));
+        $.modal.close();
+
+        // // 使用 JSON.stringify() 序列化数据
+        // const jsonData = JSON.stringify(combinedData);
+        // // 发送 AJAX 请求到后端接口
+        // $.operate.saveJson(prefix + "/qualityReport", jsonData);
     }
 
     $("input[name='inspectionTime']").datetimepicker({
@@ -131,31 +136,30 @@
     }
     //收款凭证table列表
     $(function() {
+        $('#materialNo').val(materialNo);
         var options = {
             id:"bootstrap-unqualified-table",
-            modalName: "收款凭证",
+            modalName: "品质报告单",
             showColumns: false,
             pagination: false,
             showToggle: false,
             showRefresh:false,
             showSearch:false,
             singleSelect:true,
-            columns: [{
-                checkbox: false
-            },
+            columns: [
                 {
                     title: '品质报告单id',
                     field: 'qualityOrderReportId',
                     visible: false
                 },
 
-                {title: '不良分类',field: 'processBadClassification',
+                {title: '不良分类',field: 'processBadClassification',align: 'center',
                     formatter:function (value, row, index) {
                         return processBadClassificationFormatter(value,row,index);
                     }
                 },
 
-                {title: '不良等级',field: 'processBadGrade',
+                {title: '不良等级',field: 'processBadGrade',align: 'center',
                     formatter:function (value, row, index) {
                         return processBadGradeFormatter(value,row,index);
                     }
@@ -163,6 +167,7 @@
                 {
                     title: '数量',
                     field: 'processBadNum',
+                    align: 'center',
                     editable:{
                         type: 'text',
                         mode:'inline',
@@ -177,10 +182,12 @@
                 {
                     title: '报告',
                     field: 'unqualifiedReportUrl',
-                    editable: {
-                        mode:'inline',
-                        type: 'text', // 表示该列可以被编辑为文本
-                    },
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" ><i class="fa fa-plus"></i>上传</a> ');
+                        return actions.join('');
+                    }
                 },
                 {
                     title: '操作',
@@ -193,6 +200,17 @@
                 }
             ]
         };
+        var key = 'unqualifiedDataList' + materialNo;
+
+        var dataString = sessionStorage.getItem(key);
+
+        if (dataString) {
+            var data = JSON.parse(dataString);
+            options.data = data;
+            $('input[name="inspectionTime"]').val(data[0].inspectionTime);
+            $('#remark').val(data[0].remark);
+        }
+
         $.table.init(options);
     });
 
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
index 71880fcc..8adafdf9 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
@@ -137,13 +137,9 @@
                     }
                 },
                 {
-                    title: '关联订单号',
+                    title: '关联单号',
                     field: 'relatedOrderCode',
                 },
-                {
-                    title: '入库单号',
-                    field: 'inStorageCode',
-                },
                 {
                     title: '退货节点',
                     field: 'qualityReturnNode',
@@ -152,7 +148,7 @@
                     }
                 },
                 {
-                    title: '物料数合计',
+                    title: '物料合计',
                     field: 'materialTotal',
                 },
                 {
@@ -162,14 +158,7 @@
                 {
                     title: '交付质检时间',
                     field: 'deliveryInspectionTime',
-                },
-                {
-                    title: '品质备注',
-                    field: 'qualityRemark',
-                },
-                {
-                    title: '备注',
-                    field: 'remark',
+                    visible: false,
                 },
                 {
                     title: '录入人',
@@ -192,7 +181,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        if (row.refundsExchangesStatus == 0 && row.qualityPurchaseStatus == 4){
                            actions.push('<a class="btn btn-success btn-xs ' + closingProceduresFlag + '" href="javascript:void(0)" onclick="closingProcedures(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>结案</a> ');
                        }
@@ -247,21 +236,23 @@
 
        /*添加退货单*/
         function add() {
-           var rows = $("#bootstrap-table").bootstrapTable('getSelections');
-            console.log("rows" + rows);
-           if (rows.length == 1){
-               // var curQualityReturnNode = rows[0].qualityReturnNode;
-               // var curRefundsExchangesCode = rows[0].refundsExchangesCode;
-               if (rows[0].qualityReturnNode == 1){
-                   var url = ctx + 'quality/refundsExchanges/add/' +rows[0].refundsExchangesCode;
-                   $.modal.open("添加退换货",url);
-               }else {
-                   $.modal.msgWarning("请选择退货节点为入库后退货的数据！")
-               }
-               // $.modal.open("添加" + table.options.modalName, $.operate.addUrl(rows[0].id));
-           }else{
-               $.modal.msgWarning("只能选中一行作为添加对象！")
-           }
+            var url = ctx + 'quality/refundsExchanges/add';
+            $.modal.open("添加退换货",url);
+           // var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+           //  console.log("rows" + rows);
+           // if (rows.length == 1){
+           //     // var curQualityReturnNode = rows[0].qualityReturnNode;
+           //     // var curRefundsExchangesCode = rows[0].refundsExchangesCode;
+           //     if (rows[0].qualityReturnNode == 1){
+           //         var url = ctx + 'quality/refundsExchanges/add/' +rows[0].refundsExchangesCode;
+           //         $.modal.open("添加退换货",url);
+           //     }else {
+           //         $.modal.msgWarning("请选择退货节点为入库后退货的数据！")
+           //     }
+           //     // $.modal.open("添加" + table.options.modalName, $.operate.addUrl(rows[0].id));
+           // }else{
+           //     $.modal.msgWarning("只能选中一行作为添加对象！")
+           // }
 
         };
 
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
index 10fb5961..5da58095 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
@@ -48,6 +48,9 @@
     var refundsExchangesCode  = /*[[${refundsExchangesCode}]]*/ '';
 
     var qualityRefundsExchanges = [[${qualityRefundsExchanges}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     $("input[name='deliveryInspectionTime']").datetimepicker({
         format: "yyyy-mm-dd",
@@ -136,26 +139,38 @@
                 {
                     title: '物料名称',
                     field: 'materialName',
+                    align: 'center',
                 },
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '描述',
                     field: 'materialDescribe',
+                    align: 'center',
                 },
                 {
                     title: '品牌',
                     field: 'materialBrand',
+                    align: 'center',
                 },
                 {
                     title: '单位',
                     field: 'materialUnit',
+                    align: 'center',
                 },
                 {
                     title: '加工方式',
                     field: 'materialProcessMethod',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
                 {
                     title: '品质报告',
@@ -163,13 +178,40 @@
                     formatter: function(value, row, index) {
                         // 这里直接使用row对象获取refundsExchangesCode，假设它是存在的
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')">报告</a> ');
                         return actions.join('');
                     }
                 },
                 {
                     title: '退换数',
                     field: 'refundsExchangesNum',
+                    align: 'center',
+                },
+                {
+                    title: '供应商ID',
+                    field: 'supplierCode',
+                    align: 'center',
+                },
+                {
+                    title: '供应商名称',
+                    field: 'supplierName',
+                    align: 'center',
+
+                },
+                {
+                    title: '退货联系人',
+                    field: 'customerContact',
+                    align: 'center',
+                },
+                {
+                    title: '联系人电话',
+                    field: 'contactNumber',
+                    align: 'center',
+                },
+                {
+                    title: '退货地址',
+                    field: 'supplierAddress',
+                    align: 'center',
                 }
             ]
         };

From 6c114ce5c26d05c40e72b1ed8435a8281f9df83f 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, 23 Aug 2024 16:16:23 +0800
Subject: [PATCH 2/8] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E8=B4=A7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E6=A8=A1=E5=9D=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=AD=97=E6=AE=B5=E9=80=80=E6=8D=A2=E8=B4=A7ID?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=88=97=E8=A1=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=EF=BC=8C=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BF=A1=E6=81=AF=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=89=8D=E7=A7=BB=E9=99=A4=E5=85=83=E7=B4=A0disabled=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=90=8E=E9=80=80=E8=B4=A7=E6=8A=A5=E5=91=8A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=90=8E=E9=80=80=E8=B4=A7=E7=A1=AE=E8=AE=A4=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=BB=93=E6=9E=84=EF=BC=8C=E5=93=81=E8=B4=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E5=8F=8A=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../afterConfirmDelivery.html                 | 40 ++++----
 .../afterNoConfirmSupplier.html               | 97 +++++++++++++------
 .../afterQualityReportDetail.html             | 13 ++-
 3 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html
index 6c64b32a..df51e886 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html
@@ -51,6 +51,9 @@
 
     var refundsExchangesCode = [[${qualityRefundsExchanges.refundsExchangesCode}]]
 
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
     var qualityDeliveryStatusDatas = [[${@dict.getType('quality_delivery_status')}]];
     var prefix = ctx + "quality/refundsExchanges";
     $("#form-afterConfirmDelivery-edit").validate({
@@ -156,17 +159,24 @@
                 {
                     title: '料号',
                     field: 'materialNo'
-                }, {
+                },
+                {
                     title: '物料名称',
                     field: 'materialName'
                 },
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
-                    title: '物料图片地址',
+                    title: '物料图片',
                     field: 'materialPhotourl',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value);
+                    }
                 },
                 {
                     title: '物料描述',
@@ -183,26 +193,16 @@
                 {
                     title: '物料加工方式',
                     field: 'materialProcessMethod',
-                },
-                {
-                    title: '订单数',
-                    field: 'makeTotal',
-                },
-                {
-                    title: '品质已合格数',
-                    field: 'qualityHasqualifiedNum',
-                },
-                {
-                    title: '本次到货数',
-                    field: 'thisArrivedNum',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
                 {
                     title: '品质报告',
                     align: 'center',
                     formatter: function(value, row, index) {
-                        // 这里直接使用row对象获取supplierCode，假设它是存在的
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.supplierCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')">报告</a> ');
                         return actions.join('');
                     }
                 },
@@ -227,13 +227,13 @@
 
 
     /*品质报告*/
-    function qualityReport(materialNo, supplierCode) {
+    function qualityReport(materialNo, refundsExchangesCode) {
         var queryParams = new URLSearchParams();
         queryParams.append('materialNo', materialNo);
-        queryParams.append('supplierCode', encodeURIComponent(supplierCode));
+        queryParams.append('refundsExchangesCode', encodeURIComponent(refundsExchangesCode));
 
-        var url = ctx + 'quality/qualityOrder/qualityReport?' + queryParams.toString();
-        $.modal.open("品质报告", url);
+        var url = ctx + 'quality/refundsExchanges/afterQualityReportDetail?' + queryParams.toString();
+        $.modal.open("品质报告详情", url);
     }
 
     // 列中获取收货状态下拉改变数据
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html
index d4d8e1a9..d97242be 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html
@@ -6,6 +6,8 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-afterNoConfirmSupplier-edit" th:object="${qualityRefundsExchanges}">
+        <input name="refundsExchangesId" th:field="*{refundsExchangesId}" type="hidden">
+        <input name="inStorageCode" th:field="*{inStorageCode}" type="hidden">
         <div class="form-group">
             <label class="col-sm-3 control-label">退换货单号：</label>
             <div class="col-sm-8">
@@ -13,17 +15,17 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">关联单号：</label>
+            <label class="col-sm-3 control-label">入库类型：</label>
             <div class="col-sm-8">
-                <input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text" disabled>
+                <select name="warehouseStorageType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_storage_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
+                </select>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">品质单入库类型：</label>
+            <label class="col-sm-3 control-label">品质备注：</label>
             <div class="col-sm-8">
-                <select name="warehouseStorageType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_storage_type')}" disabled>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
-                </select>
+                <input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" disabled>
             </div>
         </div>
     </form>
@@ -42,7 +44,10 @@
     var refundsExchangesCode = [[${qualityRefundsExchanges.refundsExchangesCode}]]
 
     var qualityRefundsExchanges = [[${qualityRefundsExchanges}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
+    var supplier = [];
     var $table = $("#bootstrap-table");
 
     var prefix = ctx + "quality/refundsExchanges";
@@ -50,18 +55,12 @@
         focusCleanup: true
     });
 
-    // function submitHandler() {
-    //     if ($.validate.form()) {
-    //         $.operate.save(prefix + "/returnBeforeStorageDetail", $('#form-qualityRefundsExchanges-edit').serialize());
-    //     }
-    // }
-
-
     // 新增提交
     function submitHandler() {
-        // 获取表单数据
-        // const afterNoConfirmSupplierData = $("#form-afterNoConfirmSupplier-edit").serializeArray();
-        // 获取表单数据
+
+        $("input[name='refundsExchangesCode']").removeAttr("disabled");
+        $("input[name='qualityRemark']").removeAttr("disabled");
+
         const afterNoConfirmSupplierData = $("#form-afterNoConfirmSupplier-edit").serializeArray().reduce((obj, item) => {
             obj[item.name] = item.value;
             return obj;
@@ -121,65 +120,77 @@
                 checkbox: true
             },
                 {
-                    title: '供应商ID',
-                    field: 'supplierCode',
+                    title: '退换货详情Id',
+                    field: 'refundsExchangesDetailId',
                     visible: false
                 },
                 {
-                    title: '退换货详情Id',
-                    field: 'refundsExchangesDetailId',
+                    title: '退换货单号',
+                    field: 'refundsExchangesCode',
                     visible: false
                 },
                 {
                     title: '料号',
                     field: 'materialNo'
-                }, {
+                },
+                {
+                    title: '图片',
+                    field: 'materialPhotourl',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value);
+                    }
+                },
+                {
                     title: '物料名称',
                     field: 'materialName'
                 },
                 {
                     title: '物料类型',
                     field: 'materialType',
-                },
-                {
-                    title: '物料图片地址',
-                    field: 'materialPhotourl',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料描述',
                     field: 'materialDescribe',
                 },
                 {
-                    title: '物料品牌',
+                    title: '品牌',
                     field: 'materialBrand',
                 },
                 {
-                    title: '物料单位',
+                    title: '单位',
                     field: 'materialUnit',
                 },
                 {
-                    title: '物料加工方式',
+                    title: '加工方式',
                     field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
                 {
                     title: '订单数',
                     field: 'makeTotal',
+                    visible: false
                 },
                 {
                     title: '品质已合格数',
                     field: 'qualityHasqualifiedNum',
+                    visible: false
                 },
                 {
                     title: '本次到货数',
                     field: 'thisArrivedNum',
+                    visible: false
                 },
                 {
                     title: '品质报告',
                     align: 'center',
                     formatter: function(value, row, index) {
-                        // 这里直接使用row对象获取supplierCode，假设它是存在的
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.supplierCode + '\')"><i class="fa fa-plus"></i>报告</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="qualityReport(\'' + row.materialNo + '\', \'' + row.refundsExchangesCode + '\')">报告</a> ');
                         return actions.join('');
                     }
                 },
@@ -244,6 +255,7 @@
                 codes.forEach(function (code) {
                     selectElement.append('<option value="' + code.supplierCode + '">' + code.supplierCode + '</option>');
                 });
+                supplier = codes;
                 // 设置默认值（如果存在）
                 var rowData = $table.bootstrapTable('getData')[index];
                 if (rowData && rowData.supplierCode) {
@@ -259,6 +271,14 @@
         var tableData = $table.bootstrapTable('getData');
         var newRow = tableData[rowIndex];
         newRow.supplierCode = newSupplierCode;
+        supplier.forEach(function (index){
+            if(index.supplierCode === newSupplierCode){
+                newRow.supplierName = index.supplierName;
+                newRow.customerContact = index.customerContact;
+                newRow.contactNumber = index.contactNumber;
+                newRow.supplierAddress = index.customerAddress;
+            }
+        });
         // getSupplierNameType(newRow.supplierCode,newRow,rowIndex);
         $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
 
@@ -293,9 +313,26 @@
         var tableData = $table.bootstrapTable('getData');
         var newRow = tableData[rowIndex]; // 获取当前行数据
         newRow.supplierName = newSupplierName;
+        supplier.forEach(function (index){
+            if(index.supplierName === newSupplierName){
+                newRow.customerContact = index.customerContact;
+                newRow.contactNumber = index.contactNumber;
+                newRow.supplierAddress = index.customerAddress;
+            }
+        });
         // 更新行数据
         $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
     }
+
+    function qualityReport(materialNo, refundsExchangesCode) {
+        var queryParams = new URLSearchParams();
+        queryParams.append('materialNo', materialNo);
+        queryParams.append('refundsExchangesCode', encodeURIComponent(refundsExchangesCode));
+        console.log("materialNo："+materialNo);
+        console.log("refundsExchangesCode："+refundsExchangesCode);
+        var url = ctx + 'quality/refundsExchanges/afterQualityReportDetail?' + queryParams.toString();
+        $.modal.open("品质报告详情", url);
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
index 19d46a0f..e517000a 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
@@ -89,9 +89,7 @@
             showSearch:false,
             singleSelect:true,
             queryParams:queryParams,
-            columns: [{
-                checkbox: false
-            },
+            columns: [
                 {
                     title: '品质报告单id',
                     field: 'qualityOrderReportId',
@@ -100,6 +98,7 @@
                 {
                     title: '不良分类',
                     field: 'processBadClassification',
+                    align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processBadClassificationDatas, value);
                     }
@@ -108,6 +107,7 @@
                 {
                     title: '不良等级',
                     field: 'processBadGrade',
+                    align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processBadGradeDatas, value);
                     }
@@ -115,10 +115,17 @@
                 {
                     title: '数量',
                     field: 'processBadNum',
+                    align: 'center',
                 },
                 {
                     title: '报告',
                     field: 'unqualifiedReportUrl',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" >报告</a> ');
+                        return actions.join('');
+                    }
                 },
             ]
         };

From 1d5f8803e6ba76928a71ea0c85ca26f7dd846b50 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, 23 Aug 2024 16:20:38 +0800
Subject: [PATCH 3/8] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E9=80=80=E6=8D=A2=E8=B4=A7controlle?=
 =?UTF-8?q?r=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=E9=80=80=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95service=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E5=A4=84=E7=90=86=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=9B=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E6=88=90=E9=80=80=E6=8D=A2=E8=B4=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=AF=B9=E8=B1=A1service=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=92=8C=E7=94=9F=E6=88=90=E9=80=80=E6=8D=A2=E8=B4=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?service=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?-=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86service=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=89=8D=E9=80=80=E8=B4=A7-=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7service=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=80=80=E6=8D=A2=E8=B4=A7=E8=AF=A6=E6=83=85=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E8=AE=BE=E7=BD=AE=E9=80=80=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=94=B6=E8=B4=A7=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QualityRefundsExchangesController.java    |   6 +-
 .../QualityRefundsExchangesServiceImpl.java   | 193 +++++++++++++++---
 2 files changed, 165 insertions(+), 34 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java
index 770b6054..b47cccbf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java
@@ -90,10 +90,10 @@ public class QualityRefundsExchangesController extends BaseController
     /**
      * 新增品质管理退换货单
      */
-    @GetMapping("/add/{refundsExchangesCode}")
-    public String add(@PathVariable("refundsExchangesCode") String refundsExchangesCode,ModelMap mmap)
+    @GetMapping("/add")
+    public String add(ModelMap mmap)
     {
-        mmap.put("refundsExchangesCode", refundsExchangesCode);
+//        mmap.put("refundsExchangesCode", refundsExchangesCode);
         return prefix + "/add";
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java
index 7a2baa4c..ccdd9f66 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java
@@ -2,15 +2,24 @@ package com.ruoyi.quality.service.impl;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.quality.domain.QualityRefundsExchangesDetail;
+import com.ruoyi.quality.domain.QualityRefundsExchangesUnqualified;
 import com.ruoyi.quality.mapper.QualityRefundsExchangesDetailMapper;
+import com.ruoyi.quality.mapper.QualityRefundsExchangesUnqualifiedMapper;
+import com.ruoyi.storehouse.domain.WarehousingInInfo;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
+import com.ruoyi.warehouse.mapper.WarehouseStorageOrderDetailMapper;
+import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +45,21 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
     @Autowired
     private QualityRefundsExchangesDetailMapper refundsExchangesDetailMapper;
 
+    @Autowired
+    private QualityRefundsExchangesUnqualifiedMapper unqualifiedMapper;
+
+    @Autowired
+    private WarehouseStorageOrderMapper warehouseStorageOrderMapper;
+
+    @Autowired
+    private WarehouseStorageOrderDetailMapper warehouseStorageOrderDetailMapper;
+
+    @Autowired
+    private WarehouseStorageOrderDetailMapper storageOrderDetailMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询品质管理退换货单
      * 
@@ -70,36 +94,111 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
     public int insertQualityRefundsExchanges(QualityRefundsExchanges qualityRefundsExchanges)
     {
 
-        String refundsExchangesCode = qualityRefundsExchanges.getRefundsExchangesCode();
+        String refundsExchangesCode = redisCache.generateBillNo("THH");
+        qualityRefundsExchanges.setRefundsExchangesCode(refundsExchangesCode);
 
-        if (StringUtils.isEmpty(refundsExchangesCode)){
-            log.warn("退换货单号为空:{}",refundsExchangesCode);
-        }
         String loginName = ShiroUtils.getLoginName();
+        int exchangeSum = 0;
         List<QualityRefundsExchangesDetail> refundsExchangesDetails = qualityRefundsExchanges.getRefundsExchangesDetails();
         if (StringUtils.isEmpty(refundsExchangesDetails)){
-            log.warn("物料数据为空:{}",qualityRefundsExchanges.getRefundsExchangesDetails());
+            log.warn("物料数据为空:{}",qualityRefundsExchanges.getRefundsExchangesCode());
         }
         for (QualityRefundsExchangesDetail tempDetail : refundsExchangesDetails) {
-            QualityRefundsExchangesDetail refundsExchangesDetail = new QualityRefundsExchangesDetail();
-            refundsExchangesDetail.setRefundsExchangesCode(refundsExchangesCode);
-            refundsExchangesDetail.setDeliveryInspectionTime(qualityRefundsExchanges.getDeliveryInspectionTime());
-            refundsExchangesDetail.setQualityRemark(qualityRefundsExchanges.getQualityRemark());
-            refundsExchangesDetail.setMaterialNo(tempDetail.getMaterialNo());
-            refundsExchangesDetail.setMaterialName(tempDetail.getMaterialName());
-            refundsExchangesDetail.setMaterialBrand(tempDetail.getMaterialBrand());
-            refundsExchangesDetail.setMaterialDescribe(tempDetail.getMaterialDescribe());
-            refundsExchangesDetail.setMaterialPhotourl(tempDetail.getMaterialPhotourl());
-            refundsExchangesDetail.setMaterialType(tempDetail.getMaterialType());
-            refundsExchangesDetail.setMaterialProcessMethod(tempDetail.getMaterialProcessMethod());
-            refundsExchangesDetail.setMaterialUnit(tempDetail.getMaterialUnit());
-            refundsExchangesDetail.setCreateBy(loginName);
-            refundsExchangesDetail.setCreateTime(new Date());
-            refundsExchangesDetailMapper.insertQualityRefundsExchangesDetail(refundsExchangesDetail);
+            tempDetail.setRefundsExchangesCode(refundsExchangesCode);
+            tempDetail.setDeliveryInspectionTime(qualityRefundsExchanges.getDeliveryInspectionTime());
+            tempDetail.setQualityRemark(qualityRefundsExchanges.getQualityRemark());
+            tempDetail.setQualityUnqualifiedNum(tempDetail.getRefundsExchangesNum());
+
+            exchangeSum += tempDetail.getRefundsExchangesNum();
+            tempDetail.setCreateBy(loginName);
+            tempDetail.setCreateTime(DateUtils.getNowDate());
+            refundsExchangesDetailMapper.insertQualityRefundsExchangesDetail(tempDetail);
+            List<QualityRefundsExchangesUnqualified> unqualifiedList = tempDetail.getRefundsExchangesUnqualifieds();
+            if(StringUtils.isEmpty(unqualifiedList)){
+                log.warn("不合格分类数据为空:{}",tempDetail.getRefundsExchangesCode());
+            }else{
+                for (QualityRefundsExchangesUnqualified unqualified: unqualifiedList) {
+                    unqualified.setRefundsExchangesCode(refundsExchangesCode);
+                    unqualified.setMaterialNo(tempDetail.getMaterialNo());
+                    unqualified.setMaterialName(tempDetail.getMaterialName());
+                    unqualified.setCreateBy(loginName);
+                    unqualified.setCreateTime(DateUtils.getNowDate());
+                    unqualifiedMapper.insertQualityRefundsExchangesUnqualified(unqualified);
+                }
+            }
         }
+        qualityRefundsExchanges.setMaterialTotal(refundsExchangesDetails.size());
+        qualityRefundsExchanges.setNumTotal(exchangeSum);
+        qualityRefundsExchanges.setCreateBy(loginName);
+        qualityRefundsExchanges.setCreateTime(DateUtils.getNowDate());
+        qualityRefundsExchanges.setQualityReturnNode("1");
+        qualityRefundsExchanges.setRefundsExchangesStatus("0");
+
+
+//        生成入库单
+        WarehouseStorageOrder warehouseStorageOrder = generateWarehouseStorageOrder(qualityRefundsExchanges);
+        warehouseStorageOrder.setWarehouseStorageCode(redisCache.generateBillNo("RK"));
+        warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
+        List<WarehouseStorageOrderDetail> warehouseStorageOrderDetails = createWarehouseStorageDetail(qualityRefundsExchanges,warehouseStorageOrder.getWarehouseStorageCode());
+        warehouseStorageOrderMapper.batchWarehouseStorageOrderDetail(warehouseStorageOrderDetails);
+
+        qualityRefundsExchanges.setQualityWarehouseStatus("0");
+        qualityRefundsExchanges.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode());
+        qualityRefundsExchangesMapper.insertQualityRefundsExchanges(qualityRefundsExchanges);
         return 1;
     }
-
+//    生成退换货入库单对象
+    public WarehouseStorageOrder generateWarehouseStorageOrder(QualityRefundsExchanges qualityRefundsExchanges){
+        WarehouseStorageOrder warehouseStorageOrder = new WarehouseStorageOrder();
+        warehouseStorageOrder.setRelatedOrderCode(qualityRefundsExchanges.getRefundsExchangesCode());
+        warehouseStorageOrder.setWarehouseStorageStatus("2");
+        warehouseStorageOrder.setWarehouseStorageType("3");
+        warehouseStorageOrder.setWarehouseOrderType("2");
+        warehouseStorageOrder.setWarehouseDeptType("0");
+        warehouseStorageOrder.setWarehouseQualityStatus("2");
+        warehouseStorageOrder.setActualArrivedNum(qualityRefundsExchanges.getNumTotal());
+        warehouseStorageOrder.setNotifyArrivedNum(qualityRefundsExchanges.getNumTotal());
+        warehouseStorageOrder.setStorageNum(qualityRefundsExchanges.getNumTotal());
+        warehouseStorageOrder.setQualityQualifiedNum(0);
+        warehouseStorageOrder.setQualityUnqualifiedNum(qualityRefundsExchanges.getNumTotal());
+        warehouseStorageOrder.setDeliveryInspectionTime(qualityRefundsExchanges.getDeliveryInspectionTime());
+        warehouseStorageOrder.setQualityTime(qualityRefundsExchanges.getDeliveryInspectionTime());
+        warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
+        warehouseStorageOrder.setCreateTime(DateUtils.getNowDate());
+        return warehouseStorageOrder;
+    }
+//    生成退换货入库单详情对象
+    public List<WarehouseStorageOrderDetail> createWarehouseStorageDetail(QualityRefundsExchanges qualityRefundsExchanges,String warehouseStorageCode){
+        List<WarehouseStorageOrderDetail> detailList = new ArrayList<>();
+        List<QualityRefundsExchangesDetail> exchangesDetails = qualityRefundsExchanges.getRefundsExchangesDetails();
+        if(StringUtils.isEmpty(exchangesDetails)){
+            log.warn("退换货详情物料数据为空:{}",qualityRefundsExchanges.getRefundsExchangesCode());
+        }else {
+            for (QualityRefundsExchangesDetail exchangeDetail:exchangesDetails) {
+                WarehouseStorageOrderDetail warehouseStorageOrderDetail = new WarehouseStorageOrderDetail();
+                warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode);
+                warehouseStorageOrderDetail.setRelatedOrderCode(qualityRefundsExchanges.getRefundsExchangesCode());
+                warehouseStorageOrderDetail.setWarehouseStorageStatus("2");
+                warehouseStorageOrderDetail.setWarehouseStorageType("3");
+                warehouseStorageOrderDetail.setWarehouseOrderType("2");
+                warehouseStorageOrderDetail.setWarehouseDeptType("0");
+                warehouseStorageOrderDetail.setMaterialNo(exchangeDetail.getMaterialNo());
+                warehouseStorageOrderDetail.setMaterialName(exchangeDetail.getMaterialName());
+                warehouseStorageOrderDetail.setMaterialType(exchangeDetail.getMaterialType());
+                warehouseStorageOrderDetail.setMaterialPhotourl(exchangeDetail.getMaterialPhotourl());
+                warehouseStorageOrderDetail.setMaterialBrand(exchangeDetail.getMaterialBrand());
+                warehouseStorageOrderDetail.setMaterialUnit(exchangeDetail.getMaterialUnit());
+                warehouseStorageOrderDetail.setMaterialDescribe(exchangeDetail.getMaterialDescribe());
+                warehouseStorageOrderDetail.setMaterialProcessMethod(exchangeDetail.getMaterialProcessMethod());
+                warehouseStorageOrderDetail.setMaterialDeptType("0");
+                warehouseStorageOrderDetail.setRefundsExchangesNum(exchangeDetail.getRefundsExchangesNum());
+                warehouseStorageOrderDetail.setCreateBy(ShiroUtils.getLoginName());
+                warehouseStorageOrderDetail.setCreateTime(DateUtils.getNowDate());
+                detailList.add(warehouseStorageOrderDetail);
+            }
+        }
+        return detailList;
+    }
     /**
      * 修改品质管理退换货单
      * 
@@ -192,24 +291,40 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
         if (StringUtils.isEmpty(refundsExchangesDetails)){
             log.warn("退款换货单[{}]无关联的物料详情信息", qualityRefundsExchanges.getRefundsExchangesCode());
         }
-
+        List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList = warehouseStorageOrderDetailMapper.selectStorageOrderDetailListByCode(qualityRefundsExchanges.getInStorageCode());
+        if (StringUtils.isEmpty(warehouseStorageOrderDetailList)){
+            log.warn("退款换货单[{}]无关联的入库单详情信息", qualityRefundsExchanges.getRefundsExchangesCode());
+        }
         int updateRows = 0;
         for (QualityRefundsExchangesDetail refundsExchangesDetail : refundsExchangesDetails) {
-            refundsExchangesDetail.setRefundsExchangesCode(qualityRefundsExchanges.getRefundsExchangesCode());
-            refundsExchangesDetail.setDeliveryInspectionTime(qualityRefundsExchanges.getDeliveryInspectionTime());
-            refundsExchangesDetail.setQualityRemark(qualityRefundsExchanges.getQualityRemark());
+
             refundsExchangesDetail.setUpdateBy(loginName);
-            refundsExchangesDetail.setUpdateTime(new Date());
+            refundsExchangesDetail.setUpdateTime(DateUtils.getNowDate());
 
+            for (WarehouseStorageOrderDetail storageOrderDetail:warehouseStorageOrderDetailList) {
+                if(storageOrderDetail.getMaterialNo().equals(refundsExchangesDetail.getMaterialNo())){
+                    storageOrderDetail.setSupplierCode(refundsExchangesDetail.getSupplierCode());
+                    storageOrderDetail.setSupplierName(refundsExchangesDetail.getSupplierName());
+                    storageOrderDetail.setSupplierAddress(refundsExchangesDetail.getSupplierAddress());
+                    storageOrderDetail.setCustomerContact(refundsExchangesDetail.getCustomerContact());
+                    storageOrderDetail.setContactNumber(refundsExchangesDetail.getContactNumber());
+                    storageOrderDetail.setUpdateBy(loginName);
+                    storageOrderDetail.setUpdateTime(DateUtils.getNowDate());
+                    warehouseStorageOrderDetailMapper.updateWarehouseStorageOrderDetail(storageOrderDetail);
+                }
+            }
             //更新数据库记录
             updateRows +=  refundsExchangesDetailMapper.updateQualityRefundsExchangesDetail(refundsExchangesDetail);
-
         }
+        qualityRefundsExchanges.setQualityPurchaseStatus("1");
+        qualityRefundsExchanges.setUpdateBy(loginName);
+        qualityRefundsExchanges.setUpdateTime(DateUtils.getNowDate());
+        qualityRefundsExchangesMapper.updateQualityRefundsExchanges(qualityRefundsExchanges);
         return updateRows;
     }
 
     /**
-     * 保存入库前退货-确认供应商
+     * 保存入库前退货-确认收货
      */
     @Override
     public int updateBeforeConfirmDelivery(QualityRefundsExchanges qualityRefundsExchanges) {
@@ -224,12 +339,28 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
         for (QualityRefundsExchangesDetail refundsExchangesDetail : refundsExchangesDetails) {
             refundsExchangesDetail.setRefundsExchangesCode(qualityRefundsExchanges.getRefundsExchangesCode());
             refundsExchangesDetail.setUpdateBy(loginName);
-            refundsExchangesDetail.setUpdateTime(new Date());
-
+            refundsExchangesDetail.setUpdateTime(DateUtils.getNowDate());
+            int purchaseStatus = Integer.parseInt(refundsExchangesDetail.getQualityDeliveryStatus());
+            refundsExchangesDetail.setQualityPurchaseStatus(String.valueOf((purchaseStatus+2)));
             //更新数据库记录
             updateRows +=  refundsExchangesDetailMapper.updateQualityRefundsExchangesDetail(refundsExchangesDetail);
-
         }
+        boolean allStatusZero = refundsExchangesDetails.stream()
+                .allMatch(detail -> "0".equals(detail.getQualityDeliveryStatus()));
+        boolean hasStatusOne = refundsExchangesDetails.stream()
+                .anyMatch(detail -> "1".equals(detail.getQualityDeliveryStatus()));
+        boolean allStatusTwo = refundsExchangesDetails.stream()
+                .allMatch(detail -> "2".equals(detail.getQualityDeliveryStatus()));
+        if(allStatusZero){
+            qualityRefundsExchanges.setQualityPurchaseStatus("2");
+        }else if(hasStatusOne){
+            qualityRefundsExchanges.setQualityPurchaseStatus("3");
+        }else if(allStatusTwo){
+            qualityRefundsExchanges.setQualityPurchaseStatus("4");
+        }
+        qualityRefundsExchanges.setUpdateBy(loginName);
+        qualityRefundsExchanges.setUpdateTime(DateUtils.getNowDate());
+        qualityRefundsExchangesMapper.updateQualityRefundsExchanges(qualityRefundsExchanges);
         return updateRows;
     }
 

From 7cf0b7b23e17e4b1b839675c8fad960742698bff 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, 23 Aug 2024 16:21:51 +0800
Subject: [PATCH 4/8] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93-=E9=80=80=E6=8D=A2=E8=B4=A7=E5=8D=95=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8controller=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/controller/WarehouseStorageOrderController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
index 2614d158..f01919f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
@@ -659,7 +659,7 @@ public class WarehouseStorageOrderController extends BaseController
     @RequestMapping("/storageRefundsExchangesDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storageRefundsExchangesDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
-        Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId));
+        Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
         return groupedDetails;
     }
 }

From 29963949d28b6859c3618a363ab0d62e2fd50a1c Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 23 Aug 2024 17:56:20 +0800
Subject: [PATCH 5/8] =?UTF-8?q?[feat]=20=E9=80=80=E6=8D=A2=E8=B4=A7=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93=E5=89=8D=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E6=8A=A5=E5=91=8A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforeQualityReportDetail.html            | 307 ++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html

diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
new file mode 100644
index 00000000..4a5339d1
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
@@ -0,0 +1,307 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('入库前退货品质单报告详情')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-qualityOrderReport-edit" th:object="${qualityOrderReport}">
+        <input name="supplierCode" th:field="*{supplierCode}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">料号：</label>
+            <div class="col-sm-6">
+                <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料名称：</label>
+            <div class="col-sm-6">
+                <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">订单数：</label>
+            <div class="col-sm-6">
+                <input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质已合格数：</label>
+            <div class="col-sm-6">
+                <input name="qualityHasqualifiedNum" th:field="*{qualityHasqualifiedNum}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="container">
+            <!--合格数-->
+            <div class="col-sm-12">
+                <h3>合格数</h3>
+                <div class="row">
+                    <div class="form-group col-sm-6">
+                        <label class="control-label is-required">ok允收数：</label>
+                        <input name="okAcceptedNum" th:field="*{okAcceptedNum}" class="form-control" type="text" required>
+                    </div>
+                    <div class="form-group col-sm-6">
+                        <label class="control-label">ok报告图片：</label>
+                        <input name="okReportUrl" th:field="*{okReportUrl}" class="form-control" type="text">
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="form-group col-sm-6">
+                        <label class="control-label is-required">特采/让步数：</label>
+                        <input name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="text" required>
+                    </div>
+                    <div class="form-group col-sm-6">
+                        <label class="control-label">特采报告图片：</label>
+                        <input name="specialReportUrl" th:field="*{specialReportUrl}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+            <!--不合格数-->
+            <div class="col-sm-12">
+                <div class="row">
+                    <div class="col-sm-12 d-flex align-items-center">
+                        <span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;">不合格数</span>
+                        <a class="btn btn-success ml-auto" onclick="addUnqualified()">
+                            <i class="fa fa-plus"></i> 添加
+                        </a>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-unqualified-table"></table>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <!--其他字段-->
+        <div class="form-group">
+            <label class="col-sm-4 control-label">检验完成时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="checkoutCompletionTime" th:value="${#dates.format(qualityOrderReport.checkoutCompletionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: bootstrap-table-editable-js"/>
+<script th:inline="javascript">
+
+    var processBadClassificationDatas = [[${@dict.getType('process_bad_classification')}]];
+    var processBadGradeDatas = [[${@dict.getType('process_bad_grade')}]];
+    var $table = $("#bootstrap-unqualified-table");
+    var prefix = ctx + "quality/qualityOrder";
+    $("#form-qualityOrderReport-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        // 获取表单数据
+        const qualityReportData = $("#form-qualityOrderReport-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        var table = $('#bootstrap-unqualified-table').bootstrapTable('getData');
+        // 检查表格数据是否为空
+        if (table.length===0){
+            $.modal.alertWarning("请至少添加一条不合格数再保存!");
+            return;
+        }
+        console.log(JSON.stringify(table));
+        // 将表数据转换成与qualityReportData格式一致的数组
+        var unqualifiedDataList = table.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "processBadClassification": item.processBadClassification,
+                "processBadGrade": item.processBadGrade,
+                "processBadNum": item.processBadNum,
+                "unqualifiedReportUrl": item.unqualifiedReportUrl
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, qualityReportData, { unqualifiedDataList: unqualifiedDataList });
+        // 合并表单数据和表格数据
+        // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/qualityReport", jsonData);
+    }
+
+    $("input[name='checkoutCompletionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+
+    //添加不合格数
+    function addUnqualified() {
+        // 生成一个简单的唯一标识，这里使用时间戳作为示例
+        var uniqueId = new Date().getTime();
+        // 创建一个新行数据模板，这里仅为示例，具体根据表格列来定义
+        var newRow = {
+            qualityOrderReportId:uniqueId,
+            processBadClassification: "",
+            processBadGrade: "",
+            processBadNum: "",
+            unqualifiedReportUrl: ""
+        };
+
+        // 使用Bootstrap Table的API插入新行
+        $('#bootstrap-unqualified-table').bootstrapTable('append', newRow);
+
+    }
+    //收款凭证table列表
+    $(function() {
+        var options = {
+            id:"bootstrap-unqualified-table",
+            modalName: "收款凭证",
+            showColumns: false,
+            pagination: false,
+            showToggle: false,
+            showRefresh:false,
+            showSearch:false,
+            singleSelect:true,
+            columns: [{
+                checkbox: false
+            },
+                {
+                    title: '品质报告单id',
+                    field: 'qualityOrderReportId',
+                    visible: false
+                },
+
+                {title: '不良分类',field: 'processBadClassification',
+                    formatter:function (value, row, index) {
+                        return processBadClassificationFormatter(value,row,index);
+                    }
+                },
+
+                {title: '不良等级',field: 'processBadGrade',
+                    formatter:function (value, row, index) {
+                        return processBadGradeFormatter(value,row,index);
+                    }
+                },
+                {
+                    title: '数量',
+                    field: 'processBadNum',
+                    editable:{
+                        type: 'text',
+                        mode:'inline',
+                        validate: function (v) {
+                            if (!v) return '数量不能为空';
+                            if (isNaN(v)) return '数量必须是数字';
+                            var processBadNum = parseInt(v);
+                            if (processBadNum <= 0) return '数量必须是正整数';
+                        }
+                    }
+                },
+                {
+                    title: '报告',
+                    field: 'unqualifiedReportUrl',
+                    editable: {
+                        mode:'inline',
+                        type: 'text', // 表示该列可以被编辑为文本
+                    },
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.qualityOrderReportId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }
+            ]
+        };
+        $.table.init(options);
+    });
+
+
+    // 逻辑删除不合格数前端的一行数据
+    function removeRow(qualityOrderReportId){
+        console.log(qualityOrderReportId);
+        // 直接使用 receivablesRecordsId 值进行删除操作
+        $("#bootstrap-unqualified-table").bootstrapTable('remove', {
+            field: 'qualityOrderReportId',
+            values: qualityOrderReportId
+        });
+    }
+
+
+    // 列中获取不良分类的下拉改变数据
+    function onProcessBadClassification(selectElement, rowIndex) {
+        var processBadClassificationValue = $(selectElement).val();
+        var tableData = $table.bootstrapTable('getData');
+        var newRow = tableData[rowIndex]; // 获取当前行数据
+        // 重新渲染成本小类的设备名称列
+        // 更新行数据
+        newRow.processBadClassification = processBadClassificationValue;
+        $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
+    }
+
+    // 自定义不良分类的格式化函数
+    function processBadClassificationFormatter(value, row, index) {
+        var selectHtml = '<select class="form-control" onchange="onProcessBadClassification(this, ' + index + ')">';
+
+        // 添加默认选项
+        selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
+
+        processBadClassificationDatas.forEach(function (child) {
+            selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>';
+        });
+
+        selectHtml += '</select>';
+        return selectHtml;
+    }
+
+
+
+    // 列中获取不良等级的下拉改变数据
+    function onProcessBadGrade(selectElement, rowIndex) {
+        var processBadGradeValue = $(selectElement).val();
+        var tableData = $table.bootstrapTable('getData');
+        var newRow = tableData[rowIndex]; // 获取当前行数据
+        // 重新渲染成本小类的设备名称列
+        // 更新行数据
+        newRow.processBadGrade = processBadGradeValue;
+        $table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
+    }
+
+    // 自定义不良等级的格式化函数
+    function processBadGradeFormatter(value, row, index) {
+        var selectHtml = '<select class="form-control" onchange="onProcessBadGrade(this, ' + index + ')">';
+
+        // 添加默认选项
+        selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
+
+        processBadGradeDatas.forEach(function (child) {
+            selectHtml += '<option value="' + child.dictValue + '"' + (value === child.dictValue ? ' selected' : '') + '>' + child.dictLabel + '</option>';
+        });
+
+        selectHtml += '</select>';
+        return selectHtml;
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From a2c39699fa173ba01ebd4fd60262d1575b2c5192 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 23 Aug 2024 19:34:38 +0800
Subject: [PATCH 6/8] =?UTF-8?q?[feat]=20=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=95=E5=85=A5fileinput=E6=8F=92=E4=BB=B6=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=85=A5=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E6=A8=A1=E6=80=81=E6=A1=86=E5=92=8C?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84js=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purchaseOrder/purchaseOrder.html | 118 +++++++++++++++++-
 1 file changed, 113 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
index 927e1e25..64d7ec64 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
@@ -4,6 +4,7 @@
     <th:block th:include="include :: header('采购订单列表')" />
     <th:block th:include="include :: datetimepicker-css"/>
     <th:block th:include="include :: bootstrap-select-css"/>
+    <th:block th:include="include :: bootstrap-fileinput-css" />
     <script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
 </head>
 <body class="gray-bg">
@@ -74,10 +75,13 @@
                 </form>
             </div>
 
+
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="importPurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:add">
-                    <i class="fa fa-plus"></i> 导入合同
+                <!-- 导入合同按钮 -->
+                <a class="btn btn-warning" data-toggle="modal" data-target="#importContractModal">
+                    <i class="fa fa-download"></i> 导入合同
                 </a>
+
                 <a class="btn btn-warning" onclick="exportContract()" shiro:hasPermission="purchase:purchaseOrder:exportContract">
                     <i class="fa fa-download"></i> 导出合同
                 </a>
@@ -131,9 +135,37 @@
             </div>
         </div>
     </div>
+
+
+        <!-- 导入合同模态框 -->
+        <div class="modal inmodal fade" id="importContractModal" tabindex="-1" aria-labelledby="importContractModalLabel"  role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                        </button>
+                        <h4 class="modal-title">导入合同</h4>
+                    </div>
+                    <div class="modal-body">
+                          <div class="file-loading">
+                            <input id="singleFile" name="file" type="file">
+                            <!-- 添加隐藏的输入框 -->
+                            <input id="fileIdStr" name="fileIdStr" type="text" hidden>
+                          </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                        <button type="button" class="btn btn-primary">保存</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js"/>
     <th:block th:include="include :: select2-js"/>
+    <th:block th:include="include :: bootstrap-fileinput-js" />
+    <th:block th:include="include:: zh-js" />
     <script th:src="@{/js/activiti.js}"></script>
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('purchase:purchaseOrder:edit')}]];
@@ -290,7 +322,7 @@
             });
         };
 
-
+        //导出合同
         function exportContract() {
             // 获取选中的行
             const selectedRows = $("#bootstrap-table").bootstrapTable('getSelections');
@@ -340,12 +372,87 @@
             });
 
         }
+
+
+
         // 显示警告消息的通用函数
         function showWarning(message) {
             $.modal.msgWarning(message);
         }
 
 
+
+        $(document).ready(function() {
+            // 获取导入合同按钮
+            var importContractButton = $('#importContractButton');
+
+            // 添加点击事件处理器
+            importContractButton.on('click', function(event) {
+                // 阻止默认行为
+                event.preventDefault();
+
+                // 执行校验逻辑
+                if (checkConditions()) {
+                    // 如果校验通过，则显示模态框
+                    $('#importContractModal').modal('show');
+                } else {
+                    // 如果校验失败，则显示提示信息
+                    alert('您不具备导入合同的权限！');
+                }
+            });
+
+            // 定义校验逻辑函数
+            function checkConditions() {
+                // 这里可以根据需要添加校验逻辑
+                // 例如：检查用户权限、表单状态等
+                // 返回 true 表示校验通过，false 表示校验失败
+                // 获取选中的行
+                const selectedRows = $("#bootstrap-table").bootstrapTable('getSelections');
+
+                if (selectedRows.length !== 1) {
+                    showWarning("请先选择一条采购订单");
+                    return;
+                }
+
+
+
+                return true;  // 示例：始终返回 true
+            }
+        });
+
+
+        //导入合同
+        $(document).ready(function () {
+            // 单图上传
+            $("#singleFile").fileinput({
+                uploadUrl: ctx + "common/uploadSingleFile",
+                language: 'zh',     //设置语言
+                dropZoneEnabled: true,      //是否显示拖拽区域
+                maxFileSize: 20480,   //上传文件最大值，单位kb
+                allowedFileExtensions: ['jpg', 'png', 'gif', 'jpeg'],   //指定上传文件类型
+                maxFileCount: 1,
+                initialPreviewAsData: true,
+                uploadExtraData: {
+                    img_key: "1000",
+                    img_keywords: "happy, nature",
+                }
+            }).on('fileuploaded', function (event, data, previewId, index) {
+                var response = data.response;
+                // var rsp = data.response;
+                // document.getElementById('attachFileId').value = rsp.attachFileId;
+                var attachFileId = response.data.id;
+                if (response.code === web_status.SUCCESS) {
+                    $('#fileIdStr').val(attachFileId);
+                    $.modal.msgSuccess("上传成功");
+                } else {
+                    $.modal.alertError(response.msg);
+                }
+            });
+        });
+
+
+
+
         // 订单结案
         function reviewCloseCase(){
             let data = $("#bootstrap-table").bootstrapTable("getSelections");
@@ -381,8 +488,6 @@
             });
         }
 
-
-
     function tableSet(data) {
         var options = {
             id: "closeCaseTable",
@@ -405,6 +510,9 @@
             ],
         }
     }
+
+
+
     </script>
 </body>
 </html>
\ No newline at end of file

From 6029243df39f67f2883a6bd5f94ebe9a1c430119 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 23 Aug 2024 19:37:47 +0800
Subject: [PATCH 7/8] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E7=9A=84=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=85=B6=E4=BB=96=E5=9C=B0=E5=9D=80=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/system/SysShippingAddressMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
index c38a226b..75790a1e 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysShippingAddressList" parameterType="SysShippingAddress" resultMap="SysShippingAddressResult">
         <include refid="selectSysShippingAddressVo"/>
         <where>  
-            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = concat(#{enterpriseCode}, '%')</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery_address like concat('%', #{deliveryAddress}, '%')</if>

From 1acb4040ddacb2ba95141eeaed7fb3e1487f631d Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 23 Aug 2024 19:39:47 +0800
Subject: [PATCH 8/8] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E5=87=BA=E8=B4=A7=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=EF=BC=8C=E6=94=B6=E8=B4=A7=E7=94=B5=E8=AF=9D=E5=92=8C?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E4=B8=BA=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFjs=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysSalesShippingInformController.java     |  6 +-
 .../system/salesOrder/salesDeliverGoods.html  | 75 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
index 70f31264..3396cbc3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java
@@ -90,7 +90,7 @@ public class SysSalesShippingInformController extends BaseController
     *  导出出货单1模板
     * */
     @RequiresPermissions("system:salesShippingInform:exportShippingOrderOne")
-    @Log(title = "采购订单", businessType = BusinessType.EXPORT)
+    @Log(title = "销售出货单", businessType = BusinessType.EXPORT)
     @GetMapping("/exportShippingOrderOne/{outOrderCode}")
     public void exportShippingOrderOne(@PathVariable("outOrderCode") String outOrderCode,HttpServletResponse response) {
 
@@ -103,7 +103,7 @@ public class SysSalesShippingInformController extends BaseController
      *  导出出货单2模板
      * */
     @RequiresPermissions("system:salesShippingInform:exportShippingOrderTwo")
-    @Log(title = "采购订单", businessType = BusinessType.EXPORT)
+    @Log(title = "销售出货单", businessType = BusinessType.EXPORT)
     @GetMapping("/exportShippingOrderTwo/{outOrderCode}")
     public void exportShippingOrderTwo(@PathVariable("outOrderCode") String outOrderCode,HttpServletResponse response) {
 
@@ -116,7 +116,7 @@ public class SysSalesShippingInformController extends BaseController
      *  导出出货单通知单模板
      * */
     @RequiresPermissions("system:salesShippingInform:exportShippingInformOrder")
-    @Log(title = "采购订单", businessType = BusinessType.EXPORT)
+    @Log(title = "销售出货单", businessType = BusinessType.EXPORT)
     @GetMapping("/exportShippingInformOrder/{outOrderCode}")
     public void exportShippingInformOrder(@PathVariable("outOrderCode") String outOrderCode,HttpServletResponse response) {
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html
index 073fe82e..79ccbff1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html
@@ -50,19 +50,22 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货联系人：</label>
+            <label class="col-sm-3 control-label">收货联系人(Ship To)：</label>
             <div class="col-sm-8">
-                <input name="customerDelivery" th:field="*{customerDelivery}" class="form-control" type="text" disabled>
+                <select  class="form-control" name="customerDelivery" th:field="*{customerDelivery}"  id="customerDelivery"  required>
+                    <!-- 这里动态生成生产单号选项 -->
+                </select>
+
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货电话：</label>
+            <label class="col-sm-3 control-label">收货电话(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">收货地址：</label>
+            <label class="col-sm-3 control-label">收货地址(Ship To)：</label>
             <div class="col-sm-8">
                 <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
             </div>
@@ -138,6 +141,70 @@
         $.operate.saveJson(prefix + "/salesDeliverGoods", jsonData);
     }
 
+
+
+    loadCustomerDelivery();
+    //获取已经选择客户Id相关的生产单号
+    function loadCustomerDelivery() {
+        const url = ctx + 'system/customer/shippingList';
+        const data = {
+            enterpriseCode: sysSalesOrder.enterpriseCode,
+        };
+
+        // 使用 $.ajax 发送请求
+        $.ajax({
+            type: 'POST',
+            url: url,
+            dataType: 'json',
+            data: data,
+            success: function(response) {
+                console.log("response:", response);
+
+                if (response.code === 0 && Array.isArray(response.rows) && response.rows.length > 0) {
+                    const selectElement = $('#customerDelivery');
+                    selectElement.empty();
+
+                    // 存储每个客户名称对应的信息
+                    const customerDataMap = {};
+
+                    // 遍历返回的数据，添加为下拉框的选项并存储数据
+                    $.each(response.rows, function(index, item) {
+                        const customerName = item.customerName;
+                        customerDataMap[customerName] = item; // 存储数据
+
+                        // 添加选项到下拉框
+                        selectElement.append($('<option>', {value: customerName}).text(customerName));
+                    });
+
+                    // 监听下拉框的选择变化
+                    selectElement.on('change', function() {
+                        const selectedCustomerName = $(this).val();
+                        if (selectedCustomerName in customerDataMap) {
+                            const selectedCustomer = customerDataMap[selectedCustomerName];
+                            $('#deliveryPhone').val(selectedCustomer.customerPhone);
+                            $('#deliveryAddress').val(selectedCustomer.deliveryAddress);
+                        }
+                    });
+
+                    // 如果已经有了默认选项，则设置默认值
+                    if (selectElement.children('option').length > 0) {
+                        selectElement.trigger('change');
+                    }
+                } else {
+                    // 显示错误消息
+                    $.modal.alertWarning("数据为空");
+                }
+            },
+            error: function(xhr, status, error) {
+                // 处理错误情况
+                console.error('AJAX Error:', error);
+                $.modal.alertWarning("请求失败，请稍后再试。");
+            },
+        });
+    }
+
+
+
     //物料信息展示列表
     $(function() {
         var options = {