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/WMS扫码模块/委外领料/Kf_EntrustOutBill_PDA.html |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
index 5f7f7b0..0d95624 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_PDA.html"
@@ -500,7 +500,7 @@
                 $("#HStockOrgName").val(sessionStorage["Organization"]);
                 $("#HBillType").val("1211");
                 $("#HRedBlueFlag").val("false");
-                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
+                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                     $("#HStockPlaceID").val("0");
                     $("#HStockPlaceName").val("");
                     $("#HStockPlaceName").attr("disabled", "disabled");
@@ -698,6 +698,7 @@
                         if (d.data[0].HMulSourceBill == 0) {
                             $("#HSourceBillNo").attr("disabled", "disabled");
                             $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                         }
                         if (d.data[0].HDeptID != 0) {
                             $("#HDeptID").val(d.data[0].HDeptID);
@@ -1155,7 +1156,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1400,9 +1401,9 @@
                     //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
                     $.ajax({
                         type: "Get",
-                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_New_Json",
                         async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                        data: { "HInterID": HInterID, "HBillType": HBillType },
+                        data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -1511,6 +1512,7 @@
                             if (result.data.hMulSourceFlagField == 0) {
                                 $("#HSourceBillNo").attr("disabled", "disabled");
                                 $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                             }
                             //渚涘簲鍟嗕笉鍙紪杈�
                             $("#HSupName").attr("disabled", "disabled");
@@ -1713,6 +1715,7 @@
                                     if (result.data.hMulSourceFlagField == 0) {
                                         $("#HSourceBillNo").attr("disabled", "disabled");
                                         $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                        $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                                     }
                                     //渚涘簲鍟嗕笉鍙紪杈�
                                     $("#HSupName").attr("disabled", "disabled");
@@ -1737,6 +1740,7 @@
                                         $("#HSourceBillNo").val("");
                                         $("#HSourceBillNo").attr("disabled", "disabled");
                                         $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                        $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
                                         element.tabChange('tab-Kf_EntrustOutBill_PDA', '3');
                                     }
                                 }
@@ -1803,7 +1807,7 @@
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 } else if (data[i].name == '鐗╂枡浠g爜') {
                                     col.push({
-                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠g爜', event: '鐗╂枡浠g爜', templet: function (d) {
+                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '鐗╂枡浠g爜', event: '鐗╂枡浠g爜', templet: function (d) {
                                             return '<span style="color: blue;">' + d.鐗╂枡浠g爜 + '</span>'
                                         }, style: 'cursor: pointer;'
                                     });

--
Gitblit v1.9.1