From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/Baseset/HBarPlanPrint.html                       |    3 
 WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html             |    2 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html       |  101 ++++
 WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html             |  103 ++++
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html          |  103 ++++
 WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html           |   15 
 WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html           |  100 ++++
 WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs |   26 +
 WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html        |    2 
 WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html           |  100 ++++
 WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx             |   29 +
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html              |  101 ++++
 WebTM/views/领料发货/领料出库/Kf_StockOutRequestBillList.html        |  101 ++++
 WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html              |  103 ++++
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html               |  102 ++++
 WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html          |  100 ++++
 WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_Check_PDA.html       |  131 +++++
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html                |   10 
 WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.cs          |   17 
 WebTM/WebTM.csproj                                           |    8 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html                |  103 ++++
 21 files changed, 1,338 insertions(+), 22 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 536cd79..e79fbbe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
@@ -2699,6 +2700,13 @@
     <Compile Include="App_Data\MssqlReportData.cs" />
     <Compile Include="App_Data\ReportData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.cs">
+      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.designer.cs">
+      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
       <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/Baseset/HBarPlanPrint.html b/WebTM/views/Baseset/HBarPlanPrint.html
index b829d70..33719f5 100644
--- a/WebTM/views/Baseset/HBarPlanPrint.html
+++ b/WebTM/views/Baseset/HBarPlanPrint.html
@@ -70,6 +70,9 @@
             case "HDepartMent"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
                 CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
                 break;
+            case "HGy_BarCodeBill_xiaowei"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
+                CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
+                break;
             //case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
             //    CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
             //    break;
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index cc9acdf..dd4b3aa 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -539,7 +539,7 @@
                                 resolve({
                                     HMaterID: data[0].HMaterID,
                                     HMaterNumber: data[0].HMaterNumber,
-                                    HMaterName: data[0].HMaterName,
+                                    HMaterName: data[0].HMaterName_m,
                                     HMaterModel: data[0].HMaterModel
                                 });
                             } else {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 427126c..95640e0 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -49,7 +49,8 @@
 
                     <!-- 杞Щ妯″紡閫夋嫨鎸夐挳 -->
                     <div class="transfer-mode-buttons">
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱缁戝畾</button>
+                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">灏忚溅-浠撳簱(鍏ュ簱)缁戝畾</button>
+                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer2">灏忚溅-浠撳簱(鍑哄簱)缁戝畾</button>
                         <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">灏忚溅杞Щ</button>
                         <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">浠撳簱杞Щ</button>
                     </div>
@@ -184,7 +185,7 @@
                                                 <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>cmdBind
                                 </div>
                                 <!--涓婃灦淇℃伅-->
                                 <div class="layui-tab-item">
@@ -254,7 +255,7 @@
             var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
             var HInterID_Temp = params[params[1]];      //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
             var HBillNo_Temp = params[params[2]];       //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
-
+            var bindsignal = 0;
             //#endregion
 
             // 鍒濆鍖栬浆绉绘ā寮�
@@ -276,6 +277,12 @@
 
             $('#btnCarWarehouseTransfer').on('click', function() {
                 setTransferMode('car_warehouse');
+                $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
+                setOrigin();
+            });
+            $('#btnCarWarehouseTransfer2').on('click', function () {
+                setTransferMode('car_warehouse');
+                bindsignal = 1;
                 $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
                 setOrigin();
             });
@@ -1125,7 +1132,7 @@
                     type: "GET",
                     url: GetWEBURL() + "/WEBSController/BindCarAndWH",
                     async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                    data: {  "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
+                    data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID, "bindsignal": bindsignal },
                     success: function (result) {
                         if (result.count == 1) {
                             playSound_OK();
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_Check_PDA.html"
index 9057020..3ffa531 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
                             <ul class="layui-tab-title" lay-filter="tab-all">
                                 <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
                                 <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
-                                <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+                                <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+                                <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
                             </ul>
                             <div class="layui-tab-content">
                                 <!--琛ㄥご淇℃伅-->
@@ -147,6 +148,15 @@
                                         <div class="layui-col-xs12">
                                             <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                             <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--涓嬫灦淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
                                         </div>
                                     </div>
                                 </div>
@@ -296,6 +306,7 @@
             var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
             var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
             var listOption = [];
+            var FIFOListOption = [];
             var columns = "";
             var HModName = "Kf_MateOutBill_Check_PDA";
             var ModRightName = "CE_MateOutCheck";    //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
                 ]];
                 listOption.data = data;
                 table.render(listOption);
+                FIFOListOption.data = data;
+                table.render(FIFOListOption);
 
                 //鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
                 var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
                         layer.closeAll("loading");
                     }
                 };
+
+                //涓嬫灦淇℃伅
+                FIFOListOption = {
+                    elem: '#FIFOList-table'
+                    //, toolbar: '#toolbarDemo'
+                    , cellMinWidth: 90
+                    , limit: 3000
+                    , totalRow: true
+                    , cols: [[
+                        { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+                        , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+                        , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+                        , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+                        , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+                        , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                }
             }
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
 
             form.on('submit(cmdCancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    if (OperationType == 2) {
-                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
-                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
-                    }
-                    else {
-                        parent.location.href = "../../../views/index_Mobile.html";
-                    }
+                    //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+                    $.ajax({
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                if (OperationType == 2) {
+                                    var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                                    parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                                }
+                                else {
+                                    parent.location.href = "../../../views/index_Mobile.html";
+                                }
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
                 });
             })
 
@@ -888,6 +944,7 @@
                                 layer.confirm(result.data.hRemarkField, {
                                     icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
                                     btn2: function () {
+                                        location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                     }//鍏抽棴
                                 }
                                 , function () {
@@ -1067,7 +1124,7 @@
                         type: "GET",
                         url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
                         async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound_OK();
@@ -1114,6 +1171,7 @@
                                         layer.confirm(result.data.hRemarkField, {
                                             icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
                                             btn2: function () {
+                                                location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                             }//鍏抽棴
                                         }
                                         , function () {
@@ -1154,6 +1212,52 @@
                                 $("#HQty").val("");
                                 //鏄剧ず琛ㄤ綋鏄庣粏
                                 DisBillEntryList();
+                            }
+                            //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+                            else if (result.count == 2) {
+                                playSound();
+                                element.tabChange('tab-Kf_MateOutBill_Check_PDA', '2');
+                                layer.confirm(result.Message, {
+                                    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+                                    btn2: function () {
+                                    }//鍏抽棴
+                                }
+                                , function () {
+                                    $.ajax({
+                                        type: "GET",
+                                        url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+                                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+                                        success: function (result) {
+                                            if (result.count == 1) {
+                                                //娓呯┖鏁伴噺
+                                                $("#HQty").val("");
+                                                layer.closeAll();
+                                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                                DisBillEntryList();
+                                            }
+                                            else {
+                                                playSound();
+                                                layer.msg(result.Message, {
+                                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                                }, function () {
+                                                    $("#HBarCode").select();
+                                                    $("#HBarCode").focus();
+                                                });
+                                            }
+                                        },
+                                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                        error: function (err) {
+                                            playSound();
+                                            layer.msg("閿欒锛�" + err, {
+                                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                            }, function () {
+                                                $("#HBarCode").select();
+                                                $("#HBarCode").focus();
+                                            });
+                                        }
+                                    });
+                                });//娓呯┖
                             }
                             else {
                                 playSound();
@@ -1241,6 +1345,13 @@
                             listOption.totalRow = true;
                             table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
                             table.render(listOption);
+                            if (result.data.FIFOlist.length != 0) {
+                                if (result.data.FIFOlist[0].HMaterID != 0) {
+                                    FIFOListOption.data = result.data.FIFOlist;
+                                    table.cache['FIFOList-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                                    table.render(FIFOListOption);
+                                }
+                            }
 
                             //鏉＄爜淇℃伅
                             $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index e423f49..f1ac0ce 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -241,6 +241,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
@@ -389,6 +390,9 @@
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                         }
 
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
@@ -706,6 +710,103 @@
                 });
             }
 
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+             //#endregion
             //鏉＄爜鏄庣粏
             function get_BarCodeDetail() {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index ac23e03..ceae6c4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -249,6 +249,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
@@ -331,6 +332,9 @@
                         break;
                     //缂栬緫
                     case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎
                     case 'btn-Delete': set_DeleteBill();
@@ -662,6 +666,103 @@
                 });
             }
 
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_MoveStockRequestBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+             //#endregion
             //鏂板
             function set_AddNew() {
                 layer.open({
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
index 64f2cfa..d78a453 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
@@ -240,6 +240,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -313,6 +314,9 @@
                         break;
                     //缂栬緫鎸夐挳
                     case 'btn-Edit': set_ShowBill();
+                        break;
+                        //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
@@ -631,6 +635,102 @@
                 });
             }
 
+            // 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
 
             //鏂板
             function set_AddNew() {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 08ab6b6..132fa23 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -172,6 +172,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_WMSSub" id="btn_WMSSub"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -469,6 +470,9 @@
                     //缂栬緫鎸夐挳
                     case 'btn_Edit': btn_Edit();
                         break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
+                        break;
                     //鍒犻櫎鎸夐挳
                     case 'btn_Delete': btn_Delete();
                         break;
@@ -493,6 +497,7 @@
                     //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
                     case 'btn_Drop': set_DropBill(1);
                         break;
+ 
                     //鍙嶄綔搴熸寜閽�
                     case 'btn_DeDrop': set_DropBill(2);
                         break;
@@ -1083,6 +1088,104 @@
             }
             //#endregion
 
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+            //#endregion
+
             //#region 鑷畾涔夎繃婊や笅鎷夋
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
new file mode 100644
index 0000000..2270bca
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx"
@@ -0,0 +1,29 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipFileMainBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+     <script runat="server"> 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        //鈽呯壒鍒彁绀衡槄锛�
+        //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+        //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+        SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack 鏍堟澘鐮�,HBarCode 涓鐮�,b.hnumber 鐗╂枡浠ｇ爜,b.hname 鐗╂枡鍚嶇О from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid  where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
+    }
+</script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
new file mode 100644
index 0000000..b792947
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+    public partial class xmlLBM_xiaoweizutuo : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
new file mode 100644
index 0000000..b8aa324
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+    public partial class xmlLBM_EquipFileMainBill
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 60e4ffb..7f3d5a6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -38,7 +38,7 @@
                                             <option value="" selected="selected">鍏ㄩ儴</option>
                                             <option value="1253">涓婃灦</option>
                                             <option value="1252">涓嬫灦</option>
-                                            <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
+                                            <option value="灏忚溅鍏ュ簱缁戝畾">灏忚溅缁戝畾</option>
                                             <option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
                                             <option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
                                             <option value="10004">灏忚溅閿佸畾</option>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index ae56746..d660f01 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1392,11 +1392,11 @@
                     layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); 
                     return; //return; 闃绘鍑芥暟缁х画鎵ц
                 }
-                if ($("#HExRate").val() == 0) {
-                     //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
-                    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if ($("#HExRate").val() == 0) {
+                //     //鎻愮ず璇疯緭鍏ユ眹鐜囷紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉�  锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮�  鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+                //    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 //澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
                 if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
                     $("#HPSStyleID").val(0)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index 37fe9f7..1a72627 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -211,6 +211,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -316,6 +317,9 @@
 
                             }
                         });
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //瀹℃牳
                     case 'btn-Audit': set_AuditBill();
@@ -758,6 +762,102 @@
                 }
             }
 
+            // 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
                 //閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index cf3afc8..35919cf 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -206,6 +206,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-WmsSub" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -355,6 +356,9 @@
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                         }
 
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
@@ -843,6 +847,104 @@
             }
 
 
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+             //#endregion
+
             //鍏抽棴  [1 鍏抽棴銆�2 鍙嶅叧闂璢
             function set_CloseBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index c9b879e..7115fde 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -203,6 +203,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -279,6 +280,9 @@
                         break;
                     //缂栬緫鎸夐挳
                     case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
@@ -600,6 +604,102 @@
               
             }
 
+            // 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
             //鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index ac03c71..d08aa2e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -259,6 +259,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞皟浠峰崟)</button>
@@ -394,6 +395,9 @@
                     //缂栬緫
                     case 'btn-Edit':
                         set_ShowBill();
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //涓嬫帹(鐗规壒鐢宠鍗�)
                     case 'btn-PushExceptiveCheckRequestBill':
@@ -975,6 +979,105 @@
             }
             //#endregion
 
+
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+            //#endregion
+
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
index 989ecb5..fc19d69 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
@@ -222,6 +222,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -298,6 +299,9 @@
                         break;
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
+                        break;
+                    //鎵樻暟鍙樻洿
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒楄缃�
                     case 'set_HideColumn': get_HideColumn();
@@ -788,6 +792,103 @@
             function set_Refresh() {
                 $("#btnSearch").click();
             }
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_StockOutRequestBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+            //#endregion
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 2186ab0..300c08d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -219,6 +219,7 @@
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -354,6 +355,9 @@
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                         }
 
+                        break;
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
                         break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
@@ -936,6 +940,105 @@
             }
             //#endregion
 
+            //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+             //#endregion
+
+
             //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
             function set_CloseBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 257b0a2..799e3de 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -239,6 +239,7 @@
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayableBill" id="get_LookDown_PayableBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(搴斾粯鍗�)</button>
@@ -767,7 +768,9 @@
                         }
 
                         break;
-
+                    //鎵樻暟鍙樻洿鎸夐挳
+                    case "btn-tally": set_PalletChange();
+                        break;
                     //鍒犻櫎鎸夐挳
                     case 'btn-Delete': set_DeleteBill();
                         break;
@@ -1043,6 +1046,104 @@
             }
             //#endregion
 
+             //#region 鎵樻暟鍙樻洿
+            function set_PalletChange() {
+                var checkStatus = table.checkStatus('mainTable');
+                var data = checkStatus.data;
+
+                if (data.length !== 1) {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+                    return;
+                }
+                var rowData = data[0];
+                // 鑾峰彇褰撳墠鎵樻暟
+                var currentPallet = rowData.鎵樻暟 ;
+
+                // 鑷畾涔夊脊绐楀唴瀹�
+                var content = '<div style="padding: 20px;">' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item">' +
+                    '<label class="layui-form-label">鏂版墭鏁�</label>' +
+                    '<div class="layui-input-block">' +
+                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+                    '</div>';
+
+                layer.open({
+                    type: 1,
+                    title: '鎵樻暟鍙樻洿',
+                    area: ['400px', '300px'],
+                    content: content,
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    btnAlign: 'c',
+                    yes: function (index, layero) {
+                        var newValue = $('#newPalletValue').val();
+                        var newPallet = parseInt(newValue);
+
+                        // 楠岃瘉杈撳叆
+                        if (!newValue) {
+                            layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (isNaN(newPallet)) {
+                            layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+                        if (newPallet.toString() !== newValue) {
+                            layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+                            $('#newPalletValue').focus();
+                            return false;
+                        }
+
+
+                        // 淇濆瓨鏁版嵁
+                        layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+                            type: 'POST',
+                            data: {
+                                hmainid: rowData.hmainid,
+                                hsubid: rowData.hsubid || 0,
+                                newPallet: newPallet,
+                                operator: sessionStorage["HUserName"]
+                            },
+                            success: function (result) {
+                                layer.closeAll('loading');
+                                if (result.count == 1) {
+                                    layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+                                    layer.close(index);
+                                    
+                                    window.$("#btnSearch").click();
+                                } else {
+                                    layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.closeAll('loading');
+                                layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+                            }
+                        });
+                    },
+                    success: function (layero, index) {
+                        // 璁剧疆杈撳叆妗嗙劍鐐�
+                        $('#newPalletValue').focus().select();
+                    }
+                });
+            }
+
+             //#endregion
+
             //#region 鍒锋柊
             function get_Refresh() {
                 //set_ClearQuery();

--
Gitblit v1.9.1