新增导入失败提示

modules/ration_repository/controllers/ration_repository_controller.js

@@ -180,6 +180,10 @@ class RationRepositoryController extends baseController {
                 const result = type === 'source_file' ?
                     await rationItem.batchAddFromExcel(rationRepId, sheet[0].data) :
                     await rationItem.batchUpdateSectionIdFromExcel(sheet[0].data);
+
+                if (rationItem.failGLJList.length > 0) {
+                    responseData.msg = rationItem.failGLJList.join("\r\n");
+                }
                 // 删除文件
                 if (result) {
                     fs.unlink(uploadFullName);

modules/ration_repository/models/ration_item.js

@@ -513,6 +513,8 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
     // 编码列表，用于查找库中是否有对应数据
     let rationCodeList = [];
     let gljCodeList = [];
+    // 插入失败的工料机列表(用于提示)
+    this.failGLJList = [];
     for (const tmp of data) {
         if (tmp.length <= 0) {
             continue;
@@ -521,6 +523,8 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
         if (tmp[0] === undefined && Object.keys(lastData).length > 0) {
             // 如果不存在对应的工料机库数据则跳过
             if (stdGLJList[tmp[1]] === undefined) {
+                const failString = '定额' + lastData.code + '下的' + tmp[1];
+                this.failGLJList.push(failString);
                 continue;
             }
             const tmpRationGlj = {

web/maintain/ration_repository/js/main.js

@@ -132,6 +132,10 @@ $(function () {
                     self.removeAttr('disabled');
                     self.text('确定导入');
                     if (response.err === 0) {
+                        const message = response.msg !== undefined ? response.msg : '';
+                        if (message !== '') {
+                            alert(message);
+                        }
                         // 成功则关闭窗体
                         dialog.modal("hide");
                     } else {
@@ -275,7 +279,11 @@ function createRationLib(rationObj, dispNamesArr){
                     "<td>"+createDate+" </td>" +
                     "<td><a href='javascript:void(0);' data-toggle='modal' data-target='#edit' title='编辑'>" +
                     "<i class='fa fa-pencil-square-o'></i></a> <a href='javascript:void(0);' data-toggle='modal' data-target='#del' class='text-danger' title='删除'>" +
-                    "<i class='fa fa-remove'></i></a></td></tr>");
+                    "<i class='fa fa-remove'></i></a>" +
+                    "<td><a class='btn btn-secondary btn-sm import-source' href='javacript:void(0);' data-id='"+ id +"' title='导入原始数据'><i class='fa fa-sign-in fa-rotate-90'></i>导入</a></td>" +
+                    "<td><a class='btn btn-success btn-sm export' href='javacript:void(0);' data-toggle='modal' data-id='"+ id +"' data-target='#emport' title='导出内部数据'><i class='fa fa-sign-out fa-rotate-270'></i>导出</a> " +
+                    "<a class='btn btn-secondary btn-sm import-data' href='javacript:void(0);' data-id='"+ id +"' title='导入内部数据'><i class='fa fa-sign-in fa-rotate-90'></i>导入</a></td>" +
+                    "</tr>");
                 var newHref = "/rationRepository/ration?repository="+id;
                 $("#tempId td:first a").attr("href", newHref);
                 $("#tempId").attr("id", id);