[fix]

委外加工 委外订单
修改添加委外订单页面，合并物料记录时合计计划委外数；
修改添加委外领料页面，子表去除委外数，新增可用库存数，修改页面提交函数；
修改委外订单列表页面，合并操作栏按钮；

ruoyi-admin/src/main/resources/templates/system/outsource_order/addRequisition.html

@@ -313,48 +313,42 @@
                 {
                     title: '阶层',
                     field: 'level',
+                    align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(levelDatas, value);
                     }
                 },
                 {title: '委外计划详情id', field: 'outsourcePlanDetailId',visible:false,},
-                {title: '料号', field: 'materialNo'},
-                {title: '图片', field: 'materialPhotourl', formatter: function (value, row, index) {
+                {title: '料号', field: 'materialNo', align: 'center',},
+                {title: '图片', field: 'materialPhotourl', align: 'center', formatter: function (value, row, index) {
                         return $.table.imageView(value);
                     }
                 },
-                {title: '物料类型',field: 'materialType',
+                {title: '物料类型',field: 'materialType',align: 'center',
                     formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}
                 },
-                {title: '物料名称', field: 'materialName'},
-                {title: '物料描述', field: 'description'},
-                {title: '品牌', field: 'brand'},
+                {title: '物料名称', field: 'materialName', align: 'center',},
+                {title: '物料描述', field: 'description', align: 'center',},
+                {title: '品牌', field: 'brand', align: 'center',},
                 {title: '单位', field: 'unit', align: 'center', },
                 {title: '加工方式', field: 'processMethod', align: 'center',
                     formatter: function (value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
-                {title: '计划委外数', field: 'plannedOutsourceAmount',
-                    formatter: function (value, row, index) {
-                        if(value === null || value === ''||value === undefined){
-                            value = parentRow.plannedOutsourceAmount;
-                        }
-                        return value;
-                    }
+                {
+                    title: '可用库存数',
+                    field: 'stockNum',
+                    align: 'center',
                 },
-                {title: '实际委外数', field: 'actualOutsourceAmount',
-                    formatter: function (value, row, index) {
-
-                        if(value === null || value === ''||value === undefined){
-                            value = parentRow.actualOutsourceAmount;
-                        }
-                        return value;
-                    }
+                {
+                    title: '已委外领料数',
+                    field: 'pickedNum',
+                    align: 'center',
                 },
-                {title: '已委外领料数', field: 'pickedNum'},
                 {
                     title: '<span class="is-required">本次领料数</span>',
+                    align: 'center',
                     field: 'pickingNum',
                     formatter: function(value, row, index) {
                         var html = $.common.sprintf("<input class='form-control' type='number' oninput='calculateTotal()' name='nowRequisitionAmount' id = 'pickNum_"+ childTableId +"_"+ index +"'>", index, value);
@@ -427,8 +421,22 @@
 
             var childDatas = $("#"+childTableId).bootstrapTable("getData");
             if(childDatas.length <= 0) return;
+            var childValues = false;
+            childDatas.forEach(function (material,index) {
+                var inputId = "pickNum_" + childTableId + "_" + index;
+                if ($("#" + inputId).val() === "" || $("#" + inputId).val() === "0") {
+                    return;
+                } else {
+                    childValues = true;
+                }
+            });
+            if(childValues == false){
+                return;
+            }
+
             if (typeof materialObj === 'undefined') return;
             var rows = $("#" + "bootstrap-table_" + tableId).bootstrapTable('getData').length;
+
             if(rows != 0) {
                 var data = $("#" + "bootstrap-table_" + tableId).bootstrapTable('getData')[0];
 
@@ -494,8 +502,7 @@
                             level: 1,
                             processMethod: material.processMethod,
                             materialType: material.materialType,
-                            plannedOutsourceAmount: data.plannedOutsourceAmount,
-                            actualOutsourceAmount: data.actualOutsourceAmount,
+                            stockNum: material.stockNum,
                             outsourceOrderNo: outsourceRequisition.outsourceOrderNo,
                             takenMaterial:material.pickedNum,
                             takingMaterial: value,

ruoyi-admin/src/main/resources/templates/system/outsource_order/outsource_order.html

@@ -292,18 +292,18 @@
                         // 审核状态-审核通过 使用状态-是 未发起作废流程
                         if(row.auditStatus=="1" && row.useStatus=="1"){//&& !row.cancelInstanceId
                             // 作废
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="cancel(\'' + row.outsourceOrderId + '\')"><i class="fa fa-remove"></i> 作废</a>');
+                            actions.push('<a class="' + cancelFlag + '" href="javascript:void(0)" onclick="cancel(\'' + row.outsourceOrderId + '\')"><i class="fa fa-remove"></i> 作废</a>');
                             //领料，入库
-                            actions.push('<a class="btn btn-success btn-xs" onclick="addRequisition(\''+row.outsourceOrderNo+'\')"><i class="fa fa-edit"></i>领料</a> ');
-                            actions.push('<a class="btn btn-warning btn-xs" onclick="addStorage(\''+row.outsourceOrderNo+'\')"><i class="fa fa-edit"></i>入库</a> ');
+                            actions.push('<a class="" onclick="addRequisition(\''+row.outsourceOrderNo+'\')"><i class="fa fa-edit"></i>领料</a> ');
+                            actions.push('<a class="" onclick="addStorage(\''+row.outsourceOrderNo+'\')"><i class="fa fa-edit"></i>入库</a> ');
                         }else if(row.auditStatus =="2"){
                             // 编辑
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outsourceOrderId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                            actions.push('<a class="' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outsourceOrderId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                         }
                         // 已作废
                         if(row.useStatus=="2" && !row.restoreInstanceId){
                             // 恢复
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                            actions.push('<a class="' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
                         }
                         // 有流程实例id
                         if (row.instanceId) {
@@ -312,16 +312,17 @@
                                 var todoUserIdList = row.todoUserId.split(",");
                                 if(todoUserIdList.includes(loginName) || loginName == 'admin'){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                    actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                    actions.push('<a class="" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }
                             }
                             // 审批历史
-                            actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                            actions.push('<a class="" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
                             // 进度查看
-                            actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度</a> ');
+                            actions.push('<a class="" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                         }
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.outsourceOrderId + '\')"><i class="fa fa-eye"></i>详情</a>');
-                        return actions.join('');
+                        actions.push('<a class="' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.outsourceOrderId + '\')"><i class="fa fa-eye"></i>详情</a>');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }],
                 rowStyle: function (row, index) {

ruoyi-admin/src/main/resources/templates/system/outsource_plan/addOutsourceOrder.html

@@ -342,6 +342,9 @@
                 if (!existingRecord.outsourceProcessList) {
                     existingRecord.outsourceProcessList = [];
                 }
+                var planNum = Number(existingRecord.plannedOutsourceAmount);
+                planNum = planNum + Number(current.plannedOutsourceAmount);
+                existingRecord.plannedOutsourceAmount = planNum;
                 existingRecord.outsourceProcessList = current.material.outsourceProcessList;
                 if (typeof existingRecord.correlationCodes === 'string' && typeof current.material.correlationCodes === 'string') {
                     existingRecord.correlationCodes += current.material.correlationCodes.includes(',') ? current.material.correlationCodes : `,${current.material.correlationCodes}`;