From ee27879872abe1e5352d6321a4213b16feaac489 Mon Sep 17 00:00:00 2001
From: 12888491 <295228902@qq.com>
Date: Wed, 9 Nov 2022 12:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=9C=8B=E6=9D=BF=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=9C=8B=E6=9D=BF=E4=BA=A7=E5=87=BA=E6=89=B9?=
 =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EqpScanScreen/Index.cshtml          | 133 +++++++++---------
 .../Views/EqpScanScreen/OutputMaterial.cshtml |   1 +
 2 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/Index.cshtml b/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/Index.cshtml
index adf6cb2..3d4142b 100644
--- a/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/Index.cshtml
+++ b/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/Index.cshtml
@@ -205,78 +205,81 @@
             });
         }
         function getData() {
-            layui.use(['jquery', 'common'], function () {
-                var $ = layui.jquery,
-                    common = layui.common;
-                common.ajax({
-                    url: '/RunMonitor/EqpScanScreen/GetListJson',
-                    dataType: "json",
-                    data: { keyValue: keyValue },
-                    async: false,
-                    success: function (data) {
-                        //获取领料申请和当前托盘计数及当前工单产出
-                        $('#eqpJob').html('');
-                        $('#eqpState').html('');
-                        $('#eqpNowNum').html('');
-                        $('#eqpUse').html('');
-                        if (!!data.eqpUseJob) {
-                            var html = '';
-                            for (var i = 0; i < data.eqpUseJob.length; i++) {
-                                html += '<div class="box">' + '';
-                                if (data.eqpUseJob[i].F_JobState == 2) {
-                                    html += '<div class="boxcard statefinish">';
-                                    html += '<p>申请时间:' + data.eqpUseJob[i].F_CreatorTime + '</p>';
-                                    html += '<p>申请物料:' + data.eqpUseJob[i].F_MaterialName + '</p>';
-                                    html += '<p>申请数量:' + data.eqpUseJob[i].F_NeedNum + '</p>';
-                                    html += '<p>完成状态:已完成</p>';
+            if (!!keyValue) {
+                layui.use(['jquery', 'common'], function () {
+                    var $ = layui.jquery,
+                        common = layui.common;
+
+                    common.ajax({
+                        url: '/RunMonitor/EqpScanScreen/GetListJson',
+                        dataType: "json",
+                        data: { keyValue: keyValue },
+                        async: false,
+                        success: function (data) {
+                            //获取领料申请和当前托盘计数及当前工单产出
+                            $('#eqpJob').html('');
+                            $('#eqpState').html('');
+                            $('#eqpNowNum').html('');
+                            $('#eqpUse').html('');
+                            if (!!data.eqpUseJob) {
+                                var html = '';
+                                for (var i = 0; i < data.eqpUseJob.length; i++) {
+                                    html += '<div class="box">' + '';
+                                    if (data.eqpUseJob[i].F_JobState == 2) {
+                                        html += '<div class="boxcard statefinish">';
+                                        html += '<p>申请时间:' + data.eqpUseJob[i].F_CreatorTime + '</p>';
+                                        html += '<p>申请物料:' + data.eqpUseJob[i].F_MaterialName + '</p>';
+                                        html += '<p>申请数量:' + data.eqpUseJob[i].F_NeedNum + '</p>';
+                                        html += '<p>完成状态:已完成</p>';
+                                    }
+                                    else {
+                                        html += '<div class="boxcard statedoing">';
+                                        html += '<p>申请时间:' + data.eqpUseJob[i].F_CreatorTime + '</p>';
+                                        html += '<p>申请物料:' + data.eqpUseJob[i].F_MaterialName + '</p>';
+                                        html += '<p>申请数量:' + data.eqpUseJob[i].F_NeedNum + '</p>';
+                                        html += '<p>完成状态:进行中</p>';
+                                    }
+                                    html += '<div class="boxfoot"></div>';
+                                    html += '</div>';
+                                    html += '</div>';
                                 }
-                                else {
-                                    html += '<div class="boxcard statedoing">';
-                                    html += '<p>申请时间:' + data.eqpUseJob[i].F_CreatorTime + '</p>';
-                                    html += '<p>申请物料:' + data.eqpUseJob[i].F_MaterialName + '</p>';
-                                    html += '<p>申请数量:' + data.eqpUseJob[i].F_NeedNum + '</p>';
-                                    html += '<p>完成状态:进行中</p>';
+                                $('#eqpJob').html(html);
+                            }
+                            var html0 = '';
+                            html0 += '<p>当前设备:' + data.F_EqpName + '</p>';
+                            html0 += '<p>值班人:' + data.workusers + '</p>';
+                            html0 += '<p>班次:' + data.dateClass + '</p>';
+                            if (!!data.workorders) {
+                                for (var i = 0; i < data.workorders.length; i++) {
+                                    html0 += '<p>生产物料:' + data.workorders[i].F_MaterialName + '</p>';
+                                    html0 += '<p>当前产量:' + data.workorders[i].F_DoneNum + '</p>';
                                 }
-                                html += '<div class="boxfoot"></div>';
-                                html += '</div>';
-                                html += '</div>';
                             }
-                            $('#eqpJob').html(html);
-                        }
-                        var html0 = '';
-                        html0 += '<p>当前设备:' + data.F_EqpName + '</p>';
-                        html0 += '<p>值班人:' + data.workusers + '</p>';
-                        html0 += '<p>班次:' + data.dateClass + '</p>';
-                        if (!!data.workorders) {
-                            for (var i = 0; i < data.workorders.length; i++) {
-                                html0 += '<p>生产物料:' + data.workorders[i].F_MaterialName + '</p>';
-                                html0 += '<p>当前产量:' + data.workorders[i].F_DoneNum + '</p>';
+                            html0 += '<div class="boxfoot"></div>';
+                            $('#eqpState').html(html0);
+                            var html1 = '';
+                            if (!!data.transferbox) {
+                                html1 += '<p>当前容器:' + data.transferbox.F_TransferBoxCode + '</p>';
                             }
-                        }
-                        html0 += '<div class="boxfoot"></div>';
-                        $('#eqpState').html(html0);
-                        var html1 = '';
-                        if (!!data.transferbox) {
-                            html1 += '<p>当前容器:' + data.transferbox.F_TransferBoxCode + '</p>';
-                        }
-                        else {
-                            html1 += '<p>当前容器:' + '----' + '</p>';
-                        }
-                        html1 += '<p>产出计数:' + '----' + '</p>';
-                        html1 += '<div class="boxfoot"></div>';
-                        $('#eqpNowNum').html(html1);
-                        var html2 = '';
-                        if (!!data.eqpUse) {
-                            for (var i = 0; i < data.eqpUse.length; i++) {
-                                html2 += '<p>工位物料:' + data.eqpUse[i].F_MaterialName + '</p>';
-                                html2 += '<p>剩余数量:' + data.eqpUse[i].Num + '</p>';
+                            else {
+                                html1 += '<p>当前容器:' + '----' + '</p>';
                             }
+                            html1 += '<p>产出计数:' + '----' + '</p>';
+                            html1 += '<div class="boxfoot"></div>';
+                            $('#eqpNowNum').html(html1);
+                            var html2 = '';
+                            if (!!data.eqpUse) {
+                                for (var i = 0; i < data.eqpUse.length; i++) {
+                                    html2 += '<p>工位物料:' + data.eqpUse[i].F_MaterialName + '</p>';
+                                    html2 += '<p>剩余数量:' + data.eqpUse[i].Num + '</p>';
+                                }
+                            }
+                            html2 += '<div class="boxfoot"></div>';
+                            $('#eqpUse').html(html2);
                         }
-                        html2 += '<div class="boxfoot"></div>';
-                        $('#eqpUse').html(html2);
-                    }
+                    });
                 });
-            });
+            }
         }
         $(function () {
             getData();
diff --git a/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/OutputMaterial.cshtml b/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/OutputMaterial.cshtml
index db3cc7e..e8a607c 100644
--- a/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/OutputMaterial.cshtml
+++ b/WaterCloud.Web/Areas/RunMonitor/Views/EqpScanScreen/OutputMaterial.cshtml
@@ -65,6 +65,7 @@
                     var materialBatch = "";
                     if (parentData[i].F_BatchType == 1) {
                         materialBatch = parentData[i].F_BatchPrefix + "-" + new Date().SmallFormat("yyMMDDhhmmss");
+                        $('#F_MaterialBatch').val(materialBatch);
                     }
                     else {
                         common.ajax({