From c96dcf2815c4b0434260c832894ed6588940a122 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 18 九月 2025 08:29:10 +0800
Subject: [PATCH] 乔一 条码查询模块 添加 获取样品库存

---
 WebTM/WebTM.csproj.user                                 |    4 ++--
 WebTM/views/WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html |   51 +++++++++++++++++++++++++++------------------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 85c13d8..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
index 4e8847e..7be986c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
@@ -39,7 +39,7 @@
                                     onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"
                                     autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
-                           
+
                             <div class="layui-form-inlin">
                                 <button style="width: 60px;" type="button" lay-submit="" class="layui-btn"
                                     lay-filter="cmdHBarCode" id="cmdHBarCode">鏌ヨ</button>
@@ -317,8 +317,8 @@
                                                 style="width:60px;padding-left:0px;white-space: normal;">閿�鍞嚭搴撳崟鍙�:</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input name="HSeOutStockBillNo" id="HSeOutStockBillNo" lay-verify="HSeOutStockBillNo" autocomplete="off"
-                                                class="layui-input">
+                                            <input name="HSeOutStockBillNo" id="HSeOutStockBillNo"
+                                                lay-verify="HSeOutStockBillNo" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -329,8 +329,8 @@
                                                 style="width:60px;padding-left:0px;white-space: normal;">鏉$爜鍑哄簱鏃ユ湡:</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input name="HOutStockDate" id="HOutStockDate" lay-verify="HOutStockDate" autocomplete="off"
-                                                class="layui-input">
+                                            <input name="HOutStockDate" id="HOutStockDate" lay-verify="HOutStockDate"
+                                                autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -341,8 +341,8 @@
                                                 style="width:60px;padding-left:0px;">鏍峰搧搴撳瓨:</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <input name="HSampleQty" id="HSampleQty" lay-verify="HSampleQty" autocomplete="off"
-                                                class="layui-input">
+                                            <input name="HSampleQty" id="HSampleQty" lay-verify="HSampleQty"
+                                                autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -356,7 +356,12 @@
                             </div>
                         </div>
                     </div>
-
+                    <div class="layui-inline">
+                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                            <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" autocomplete="off"
+                                class="layui-input">
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>
@@ -391,6 +396,7 @@
                 });
                 element.tabChange('tab-Gy_BarCodeBill_QiaoYi_PDA', '1');
                 var pFocus = $("#HBarCode_In");
+                $("#HStockOrgID").val(sessionStorage["Organization"])
                 pFocus.focus();     //鑾峰彇鍏夋爣
                 pFocus.select();
                 set_InitGrid();     //鍒濆鍖栬〃鏍�
@@ -512,14 +518,14 @@
                                 "HICMOBillSubQty": data.鐢熶骇璁㈠崟瀛愯〃鏁伴噺,
                                 "HProcessExchangeBillMainQty": data.娴佽浆鍗′富琛ㄦ暟閲�,
                                 "HSeOutStockBillNo": data['閿�鍞嚭搴撳崟鍙�'],
-                                "HOutStockDate":data["鏉$爜鍑哄簱鏃ユ湡"],
+                                "HOutStockDate": Pub_Format(data["鏉$爜鍑哄簱鏃ユ湡"], "yyyy-MM-dd hh:mm:ss"),
                             });
                             ////$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                             ////$("#HBarCode").css("background-color", "#efefef4d");
 
 
 
-
+                            get_SampleQty()
                             HProcExchBillNoFlag = true;
                             layer.close(index);
                         }
@@ -537,18 +543,15 @@
 
             // #region 鑾峰彇鏍峰搧搴撳瓨
             function get_SampleQty() {
-                var HBarCode = $("#HBarCode").val();            //鏉$爜缂栧彿
-                var HMater = $("#HMater").val();                //鐗╂枡
-                var HAuxProp = $("#HAuxProp").val();            //杈呭姪灞炴��
-                var HBatchNo = $("#HBatchNo").val();            //鎵瑰彿
-                var HWHName = $("#HWHName").val();              //浠撳簱
-                var HSPName = $("#HSPName").val();              //浠撲綅
-                var HStockOrgName = $("#HStockOrgID").val();    //缁勭粐
+                var HBarCode = $("#HBarCode").val() || "";            //鏉$爜缂栧彿
+                var HMater = $("#HMater").val() || "";                //鐗╂枡
+                var HAuxProp = $("#HAuxProp").val() || "";            //杈呭姪灞炴��
+                var HBatchNo = $("#HBatchNo").val() || "";            //鎵瑰彿
+                var HWHName = $("#HWHName").val() || "";              //浠撳簱
+                var HSPName = $("#HSPName").val() || "";              //浠撲綅
+                var HStockOrgName = $("#HStockOrgID").val() || "";    //缁勭粐
 
-                if (setInitDisplayFlag) {
-                    HBarCode = "娴嬭瘯";
-                    setInitDisplayFlag = false;
-                }
+
                 HWHName = "鏍峰搧"
                 sWhere = "'" + HBarCode + "','" + HMater + "','" + HAuxProp + "','" + HBatchNo + "','" + HWHName + "','" + HSPName + "','" + HStockOrgName + "'";
 
@@ -566,12 +569,12 @@
                         }
                     },
                     error: function () {
+                        layer.alert("鑾峰彇鏍峰搧搴撳瓨澶辫触!", { icon: 5 });
+                    },
+                    complete: function() {
                         layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-
-                DisPlay_HideColumn();
             }
             //#endregion
 

--
Gitblit v1.9.1