From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库:子表件数可以输入为0 乔一客户物料即时库存报表:把米数和件数的合计加上去 (按生产订单)客户订单:过滤条件改为模糊查询

---
 WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index bae14aa..a695379 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -149,13 +149,7 @@
                                                             <input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                            <!--<select name="HReceiveMan" lay-filter="HReceiveMan" id="HReceiveMan">
-                                                                <option value="" selected="selected">璇烽�夋嫨</option>
-                                                                <option value="鏉庡痉绂�">鏉庡痉绂�</option>
-                                                                <option value="宕旀潵姝�">宕旀潵姝�</option>
-                                                                <option value="閮戦洦">閮戦洦</option>
-                                                            </select>-->
+                                                            </button>                                                           
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
@@ -257,7 +251,7 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">澶囨敞:</label>
                                                         <div class="layui-input-inline">
-                                                            <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
+                                                            <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -797,14 +791,14 @@
                             "HSourceName": HSourceName
                         },
                         success: function (data) {
-                            if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            if (data.count == 1 && data.data.length!=0)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             {
-                                var LoadData = data.data;
+                                var LoadData = data.data;                               
                                 EquipNumber = LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
                             }
                             else {
                                 EquipNumber = "";
-                                layer.alert(data.Message, { icon: 5 });
+                                //layer.alert(data.Message, { icon: 5 });
 
                             }
                         },
@@ -1112,7 +1106,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1202,7 +1196,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1240,7 +1234,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1345,6 +1339,8 @@
                         $("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);  //璐d换浜�
                         $("#HBadProcMan").val(checkStatus.data[0].HItemID);        //璐d换浜�
+                        $("#HRecDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HRecDeptID").val(checkStatus.data[0].HDeptID);
                         if (DeptName == "鐢熶骇閮�3") {
                             $("#HQEMan").val(162622);
                             $("#HQEManName").val("瀛欐枃闈�");
@@ -1551,7 +1547,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?type=HWorkShifts', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1577,7 +1573,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
                     , resize: false
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟

--
Gitblit v1.9.1