From bef1b10cc26f29b96c5eb7afacfdcce8ca534ea5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_CusBar_PDA.html |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
index fcea279..8479e9b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_CusBar_PDA.html"
@@ -523,7 +523,7 @@
                 $("#HStockOrgName").val(sessionStorage["Organization"]);
                 $("#HBillType").val("1205");
                 $("#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");
@@ -766,6 +766,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);
@@ -1468,9 +1469,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) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -1625,6 +1626,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");
@@ -1886,6 +1888,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");
@@ -1916,6 +1919,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_SellOutBill_CusBar_PDA', '3');
                                                     }
                                                 }
@@ -2044,6 +2048,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");
@@ -2074,6 +2079,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_SellOutBill_CusBar_PDA', '3');
                                         }
                                     }

--
Gitblit v1.9.1