From 141421117a797dbd5f2c64918046ec1b7ec6f39f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 31 十月 2025 16:55:54 +0800
Subject: [PATCH] 出入库模块扫描物料条码方法,增加小卫客户条码解析

---
 CLOUDWEB/WebService1.asmx.cs |  332 +++++++++++++++++++++++++------------------------------
 1 files changed, 152 insertions(+), 180 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 294eadc..ea9bce5 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -59593,12 +59593,12 @@
                             else if (oSystemParameter.omodel.WMS_CampanyName == "灏忓崼")
                             {
                                 //瑙f瀽鏉$爜
-                                if (!GetJXBarCode_XiaoWei(sBarCode, HQty, HStockOrgID, ref sErrMsg))
+                                if (!GetJXBarCode_XiaoWei(sBarCode, HStockOrgID, ref sErrMsg))
                                 {
                                     return null;
                                 }
 
-                                if (dal.GetInfoByBarCode_View(sBarCode))
+                                if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOrgID))
                                 {
                                     if (dal.omodel_View.HStopflag)
                                     {
@@ -59607,71 +59607,22 @@
                                     }
                                     else
                                     {
-                                        //鍒ゆ柇鏉$爜绫诲瀷鏄惁涓烘墭鐩樻潯鐮侊紝濡傛灉鏄墭鐩樻潯鐮佸垯鍒嗚В骞舵ā鎷熸壂鐮�
-                                        if (dal.omodel_View.HBarCodeType == "鎵樼洏鏉$爜")
+                                        //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
+                                        oBar = get_SavePonderationBillMain_Temp_BarCode(dal.omodel_View, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, SourceFlag, HSourceBillType, HStockOrgID, HCustom1, HCustom2, oSystemParameter.omodel, ref sErrMsg);
+                                        if (oBar == null)
                                         {
-                                            //鍒嗚В鎵樼洏鏉$爜寰楀埌鏄庣粏鏉$爜淇℃伅鍐欏叆鏉$爜鍑哄叆搴撲复鏃惰〃
-                                            DataSet dsTBarCode = oCn.RunProcReturn("exec h_p_WMS_BeforeCheckToTPBarCode '" + sBarCode + "'", "h_p_WMS_BeforeCheckToTPBarCode");
-                                            if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
-                                            {
-                                                sErrMsg = "鍒嗚В鎵樼洏鏉$爜鍙戠敓閿欒锛�";
-                                                return null;
-                                            }
-                                            else
-                                            {
-                                                if (DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[0][0]) == 1)
-                                                {
-                                                    sErrMsg = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[0]["HRemark"]);
-                                                    return null;
-                                                }
-                                                else
-                                                {
-                                                    for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
-                                                    {
-                                                        dal.omodel_View.HBarCode = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCode"]);
-                                                        dal.omodel_View.HBarCodeType = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeType"]);
-                                                        dal.omodel_View.HMaterID = DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[i]["HMaterID"]);
-                                                        dal.omodel_View.HAuxPropID = DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[i]["HAuxPropID"]);
-                                                        dal.omodel_View.HBatchNo = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBatchNo"]);
-                                                        dal.omodel_View.HQty = DBUtility.ClsPub.isDoule(dsTBarCode.Tables[0].Rows[i]["HQty"]);
-                                                        dal.omodel_View.HSourceInterID = DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[i]["HSourceInterID"]);
-                                                        dal.omodel_View.HSourceEntryID = DBUtility.ClsPub.isLong(dsTBarCode.Tables[0].Rows[i]["HSourceEntryID"]);
-                                                        dal.omodel_View.HSourceBillNo = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HSourceBillNo"]);
-                                                        dal.omodel_View.HMTONo = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HMTONo"]);
-
-                                                        //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
-                                                        oBar = get_SavePonderationBillMain_Temp_BarCode(dal.omodel_View, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, SourceFlag, HSourceBillType, HStockOrgID, HCustom1, HCustom2, oSystemParameter.omodel, ref sErrMsg);
-                                                        if (oBar == null)
-                                                        {
-                                                            sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忓け璐ワ紒" + dal.omodel_View.HBarCode + sErrMsg;
-                                                            return null;
-                                                        }
-                                                        SourceFlag = true;
-                                                    }
-                                                }
-                                                return oBar;
-                                            }
+                                            sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+                                            return null;
                                         }
                                         else
-                                        //鏉$爜绫诲瀷涓嶄负鎵樼洏鏉$爜
                                         {
-                                            //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
-                                            oBar = get_SavePonderationBillMain_Temp_BarCode(dal.omodel_View, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, SourceFlag, HSourceBillType, HStockOrgID, HCustom1, HCustom2, oSystemParameter.omodel, ref sErrMsg);
-                                            if (oBar == null)
-                                            {
-                                                sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
-                                                return null;
-                                            }
-                                            else
-                                            {
-                                                return oBar;
-                                            }
+                                            return oBar;
                                         }
                                     }
                                 }
                                 else
                                 {
-                                    sErrMsg = "鏉$爜妗f涓笉瀛樺湪璇ユ潯鐮侊紝璇风‘璁ゆ潯鐮佹槸鍚︽纭垨鏄惁宸茶鍒犻櫎锛�";
+                                    sErrMsg = "鏉$爜妗f涓笉瀛樺湪璇ユ潯鐮侊紝鏉$爜瑙f瀽澶辫触锛�";
                                     return null;
                                 }
                             }
@@ -59893,6 +59844,42 @@
                                     else
                                     {
                                         sErrMsg = "鏉$爜妗f涓笉瀛樺湪璇ユ潯鐮侊紝璇风‘璁ゆ潯鐮佹槸鍚︽纭垨鏄惁宸茶鍒犻櫎锛�";
+                                        return null;
+                                    }
+                                }
+                                else if (oSystemParameter.omodel.WMS_CampanyName == "灏忓崼")
+                                {
+                                    //瑙f瀽鏉$爜
+                                    if (!GetJXBarCode_XiaoWei(sBarCode, HStockOrgID, ref sErrMsg))
+                                    {
+                                        return null;
+                                    }
+
+                                    if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOrgID))
+                                    {
+                                        if (dal.omodel_View.HStopflag)
+                                        {
+                                            sErrMsg = "鏉$爜宸茶绂佺敤锛屼笉鍏佽鎵弿锛�";
+                                            return null;
+                                        }
+                                        else
+                                        {
+                                            //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
+                                            oBar = get_SavePonderationBillMain_Temp_BarCode(dal.omodel_View, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, SourceFlag, HSourceBillType, HStockOrgID, HCustom1, HCustom2, oSystemParameter.omodel, ref sErrMsg);
+                                            if (oBar == null)
+                                            {
+                                                sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+                                                return null;
+                                            }
+                                            else
+                                            {
+                                                return oBar;
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        sErrMsg = "鏉$爜妗f涓笉瀛樺湪璇ユ潯鐮侊紝鏉$爜瑙f瀽澶辫触锛�";
                                         return null;
                                     }
                                 }
@@ -62996,142 +62983,127 @@
         #region 灏忓崼鏉$爜瑙f瀽
 
         [WebMethod]
-        public bool GetJXBarCode_XiaoWei(string sBarCode, Double HQty,long HStockOrgID, ref string sErrMsg)
+        public bool GetJXBarCode_XiaoWei(string sBarCode,long HStockOrgID, ref string sErrMsg)
         {
             try
             {
-                //鏉$爜瑙f瀽
                 SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+                //鑾峰彇瀵瑰簲鏉$爜瑙f瀽鏁版嵁
                 string[] str = sBarCode.Split('@');
 
-                //閫氳繃鏉$爜瀛楁鏁伴噺杩涘叆涓嶅悓鐨勮В鏋愭柟寮忥紝鍥犱负鏈夊悓涓�涓暟缁勪綅缃紝濉啓鐨勬槸涓嶅悓瀛楁鐨勫唴瀹癸紝姣斿鏈夌殑绗笁浣嶆樉绀虹殑鏄壒鍙蜂俊鎭紝鏈夌殑绗笁浣嶆樉绀虹殑鏄墿鏂欏悕绉颁俊鎭�
-                if (str.Length == 4)
+                if (str.Length < 6)
                 {
-                    DataSet ds;
-                    string HMaterNumber = str[0];
-                    string HSupNumber = str[1];
-                    string HBatchNo = str[2];
-                    string HBarQty = str[3];
-
-                    string HSupIDs = "0";
-                    //鏌ヨ渚涘簲鍟�
-                    ds = oCn.RunProcReturn("select * from Gy_Supplier with(nolock) where HNumber ='" + HSupNumber + "' and HUSEORGID=" + HStockOrgID, "Gy_Supplier");
-                    if (ds.Tables[0].Rows.Count == 0)
-                    {
-                        sErrMsg = "鏉$爜瑙f瀽澶辫触,璇风‘璁ゆ潯鐮佷緵搴斿晢鏄惁姝g‘!";
-                        return false;
-                    }
-                    else
-                    {
-                        HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
-                    }
-
-                    string HMaterNames = "";
-                    string HMaterModels = "";
-                    string HMaterIDs = "0";
-                    string HISKFPERIOD = "0";// 淇濊川鏈熷惎鐢ㄦ爣璁�
-                    string HUnitIDs = "0";
-                    //鏌ヨ鐗╂枡
-                    ds = oCn.RunProcReturn("select  HUnitID,HItemID,HName,HModel,case HISKFPERIOD when 1 then '1' else '0' end HISKFPERIOD from Gy_Material a with(nolock) where HNumber='" + HMaterNumber + "' and HUSEORGID=" + HStockOrgID + " order by a.HISKFPERIOD desc", "Gy_Material");
-                    if (ds.Tables[0].Rows.Count == 0)
-                    {
-                        sErrMsg = "鏉$爜瑙f瀽澶辫触,璇风‘璁ゆ潯鐮佺墿鏂欐槸鍚︽纭�!";
-                        return false;
-                    }
-                    else
-                    {
-                        HMaterIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
-                        HMaterNames = ds.Tables[0].Rows[0]["HName"].ToString();
-                        HMaterModels = ds.Tables[0].Rows[0]["HModel"].ToString();
-                        HISKFPERIOD = ds.Tables[0].Rows[0]["HISKFPERIOD"].ToString();
-                        HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
-                    }
-                    DateTime HDate = DateTime.Now;//鏃ユ湡
-                    string HProduceDate = "";//鐢熶骇鏃ユ湡
-                    string HExpiryDate = "";//淇濊川鏈熻嚦
-
-                    string HSourceInterIDs = "0";
-                    string HSourceEntryIDs = "0";
-                    string HSourceBillNos = "";
-                    string HInnerBillNos = "";
-
-                    //鏃ユ湡鑾峰彇鏂瑰紡
-                    string HBarCodeType = "鎵规鏉$爜";
-                    Int64 HMaterID = int.Parse(HMaterIDs);
-                    Int64 HUnitID = int.Parse(HUnitIDs);
-
-                    Int64 HSupID = int.Parse(HSupIDs);
-                    Int64 HGroupID = 0;
-                    int HPrintQty = 1;
-
-                    Int64 HSourceInterID = int.Parse(HSourceInterIDs);
-                    Int64 HSourceEntryID = int.Parse(HSourceEntryIDs);
-                    string HSourceBillNo = HSourceBillNos;
-                    string HSourceBillType = "";
-                    string HWei = "0";      //灏炬暟
-
-                    Int64 HBarcodeQtys = 0;     //鎬绘墭鏁�
-                    Int64 HBarcodeNo = 0;       //鎵樺彿
-                    Int64 HDeptID = 0;
-                    string HRemark = "鏉$爜瑙f瀽";
-
-                    Int64 HCusID = 0;
-                    string HCusType = "";
-                    DateTime HEndDate = DateTime.Now;
-                    string HWorkLineName = "";
-
-                    long HOrgID = HStockOrgID;
-                    string HSeOrderBillNo = "";
-                    Int64 HInterIDs = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
-                    Int64 HEntryID = 1;
-
-                    bool HGiveAwayFlag = false;
-
-                    string HMaterName = HMaterNames;
-                    string HMaterModel = HMaterModels;
-                    string HPinfan = "";
-                    string HMTONo = "";
-                    Int64 HAuxPropID = 0;
-                    string HInnerBillNo = HInnerBillNos;
-
-
-                    //Int64 HWhID = 0;
-                    //Int64 HSPID = 0;
-
-                    oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
-                                ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
-                                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
-                                ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
-                                ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
-                                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
-                                ",HGiveAwayFlag " +
-                                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
-                                ",HProduceDate,HExpiryDate,HISKFPERIOD " +
-                                ") values ("
-                                + "'" + sBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HBarQty.ToString()
-                                + ",'" + HBatchNo + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'admin',getdate()," + HPrintQty.ToString() + "," + HBarQty.ToString()
-                                + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
-                                + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + ",0,0,'" + HRemark + "'"
-                                + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "',getdate()" 
-                                + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterIDs.ToString() + "," + HEntryID.ToString() + ""
-                                + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
-                                + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HProduceDate + "','" + HExpiryDate + "'," + HISKFPERIOD + ")");
-
-                    return true;
+                    sErrMsg = "鏉$爜瑙f瀽澶辫触,鏉$爜鏍煎紡閿欒锛屽繀椤诲寘鍚渶灏�5涓� @ 鍒嗛殧绗︼紒";
+                    return false;
                 }
-                else if (str.Length == 5)
-                {                   
-                    //鍙﹀涓�绉嶈В鏋愭柟娉�
+                string sHMaterNumber = str[0];      //鐗╂枡缂栫爜
+                string sHSupNumber = str[1];        //渚涘簲鍟嗙紪鐮�
+                string sHBatchNo = str[2];          //鏉ユ枡鎵瑰彿/鐗╂枡鍚嶇О
+                string sHBarQty = str[3];           //鏉ユ枡鏁伴噺
+                string sHPOOrderBillNo = str[4];    //閲囪喘璁㈠崟缂栫爜
 
-                    return true;
+                //瀹氫箟骞惰祴鍊兼潯鐮佽〃鎵�闇�鍐欏叆瀛楁鏁版嵁
+                Int64 HInterID = 0;             //涓籌D
+                Int64 HEntryID = 0;             //瀛怚D
+                string HBarCodeType = "鍞竴鏉$爜";       //鏉$爜绫诲瀷
+                Int64 HMaterID = 0;             //鐗╂枡ID
+                Int64 HUnitID = 0;              //璁¢噺鍗曚綅ID
+                Int64 HAuxPropID = 0;           //杈呭姪灞炴�D
+                string HBatchNo = "";           //鎵规鍙�
+                string HMTONo = "";             //MTO鍙�
+                double HQty = DBUtility.ClsPub.isDoule(sHBarQty);   //鏁伴噺
+                double HinitQty = 0;            //鍒濆鍖栨暟閲忥紙鐢熸垚鏉$爜鏃舵暟閲忥級
+                double HSourceBillQty = 0;      //婧愬崟鍙敓鎴愭潯鐮佹暟閲�
+                bool HGiveAwayFlag = false;     //鏄惁璧犲搧
+                string HProduceDate = "";       //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+                string HExpiryDate = "";        //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+                bool HISKFPERIOD = false;       //鏄惁鍚敤淇濊川鏈�
+                string HEXPUNIT = "";           //淇濊川鏈熷崟浣�
+                double HEXPPERIOD = 0;          //淇濊川鏈�
+                Int64 HWhID = 0;                //浠撳簱ID
+                Int64 HSPID = 0;                //浠撲綅ID
+                Int64 HBarcodeQtys = 0;         //鎬绘墭鏁�
+                Int64 HBarcodeNo = 0;           //褰撳墠鎵樺彿
+                string HEndQty = "";            //灏炬暟
+                Int64 HSourceInterID = 0;       //婧愬崟ID
+                Int64 HSourceEntryID = 0;       //婧愬崟瀛怚D
+                string HSourceBillNo = sHPOOrderBillNo; //婧愬崟鍗曞彿
+                string HSourceBillType = "1102";        //婧愬崟绫诲瀷锛堥噰璐鍗�1102锛�
+                Int64 HInitSourceEntryID = 0;           //鍒濆鍖栨簮鍗曞瓙ID锛堢敓鎴愭潯鐮佹椂婧愬崟瀛怚D锛�
+                string HRemark = "瑙f瀽鐢熸垚";            //澶囨敞
+                Int64 HPrintQty = 0;            //鎵撳嵃娆℃暟
+                Int64 HDeptID = 0;              //閮ㄩ棬ID
+                Int64 HSupID = 0;               //寰�鏉ュ崟浣岻D
+                Int64 HGroupID = 0;             //鐢熶骇鐝粍ID
+                Int64 HCusID = 0;               //瀹㈡埛ID
+                string HCusType = "";           //瀹㈡埛鍨嬪彿
+                string HSeOrderBillNo = "";     //閿�鍞鍗曞彿
+                Int64 HSeOrderSEQ = 0;          //閿�鍞鍗曡鍙�
+                string HInnerBillNo = "";       //鍐呴儴閲囪喘璁㈠崟鍙�
+                string HWorkLineName = "";      //鐢熶骇绾�
+                string HMaterName = "";         //浜у搧鍚嶇О
+                string HMaterModel = "";        //浜у搧瑙勬牸鍨嬪彿
+                string HPinfan = "";            //鍝佺暘
+                DateTime HEndDate = DateTime.Now; ;     //璁″垝瀹屽伐鏃ユ湡
+
+                //鑾峰彇鐗╂枡鐩稿叧鏁版嵁
+                DataSet Mds = oCn.RunProcReturn("select top 1 HItemID,HNumber,HName,HModel,HUnitID,HISKFPERIOD,HEXPUNIT,HEXPPERIOD from Gy_Material with(nolock) where HNumber='" + sHMaterNumber + "' and HUSEORGID=" + HStockOrgID.ToString() + " order by HISKFPERIOD desc", "Gy_Material");
+                if (Mds.Tables[0].Rows.Count == 0)
+                {
+                    sErrMsg = "鏉$爜瑙f瀽澶辫触,璇风‘璁ゆ潯鐮佷腑鐗╂枡缂栫爜锛�" + sHMaterNumber + " 鏄惁姝g‘锛�";
+                    return false;
                 }
                 else
                 {
-                    sErrMsg = "鏉$爜瑙f瀽澶辫触,璇风‘璁ゆ潯鐮佹槸鍚︽纭�!";
-                    return false;
+                    HMaterID = DBUtility.ClsPub.isLong(Mds.Tables[0].Rows[0]["HItemID"]);
+                    HMaterName = DBUtility.ClsPub.isStrNull(Mds.Tables[0].Rows[0]["HName"]);
+                    HUnitID = DBUtility.ClsPub.isLong(Mds.Tables[0].Rows[0]["HUnitID"]);
+                    HISKFPERIOD = DBUtility.ClsPub.isBool(Mds.Tables[0].Rows[0]["HISKFPERIOD"]);
+                    HEXPUNIT = DBUtility.ClsPub.isStrNull(Mds.Tables[0].Rows[0]["HEXPUNIT"]);
+                    HEXPPERIOD = DBUtility.ClsPub.isDoule(Mds.Tables[0].Rows[0]["HEXPPERIOD"]);
                 }
 
-                
+                //鑾峰彇鎵瑰彿
+                if (str.Length == 6)
+                {
+                    HBatchNo = sHBatchNo;
+                }
+
+                //鑾峰彇渚涘簲鍟嗙浉鍏虫暟鎹�
+                DataSet Sds = oCn.RunProcReturn("select top 1 HItemID from Gy_Supplier with(nolock) where HNumber='" + sHSupNumber + "' and HUSEORGID=" + HStockOrgID.ToString(), "Gy_Supplier");
+                if (Sds.Tables[0].Rows.Count == 0)
+                {
+                    sErrMsg = "鏉$爜瑙f瀽澶辫触,璇风‘璁ゆ潯鐮佷腑渚涘簲鍟嗙紪鐮侊細" + sHSupNumber + " 鏄惁姝g‘锛�";
+                    return false;
+                }
+                else
+                {
+                    HSupID = DBUtility.ClsPub.isLong(Sds.Tables[0].Rows[0]["HItemID"]);
+                }
+                //鍐欏叆鏉$爜妗f琛�
+                oCn.RunProc("insert into Gy_BarCodeBill" +
+                        "(HInterID,HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID" +
+                        ",HAuxPropID,HBatchNo,HMTONo,HQty,HinitQty,HSourceBillQty" +
+                        ",HProduceDate,HExpiryDate" +
+                        ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD,HBarCodeDate,HGiveAwayFlag" +
+                        ",HWhID,HSPID,HBarcodeQtys,HBarcodeNo,HEndQty" +
+                        ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HInitSourceEntryID,HRemark" +
+                        ",HPrintQty,HSTOCKORGID,HOWNERID,HDeptID,HSupID,HGroupID" +
+                        ",HCusID,HCusType,HSeOrderBillNo,HSeOrderSEQ,HInnerBillNo,HWorkLineName" +
+                        ",HMaterName,HMaterModel,HPinfan,HEndDate,HMaker,HMakeDate" +
+                        ") values ("
+                        + " " + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + sBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString()
+                        + ", " + HAuxPropID.ToString() + ",'" + HBatchNo + "','" + HMTONo + "'," + HQty.ToString() + "," + HinitQty.ToString() + "," + HSourceBillQty.ToString()
+                        + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+                        + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString() + ",getdate()," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+                        + ", " + HWhID.ToString() + "," + HSPID.ToString() + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",'" + HEndQty + "'"
+                        + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HInitSourceEntryID.ToString() + ",'" + HRemark + "'"
+                        + ", " + HPrintQty.ToString() + "," + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + "," + HDeptID.ToString() + "," + HSupID.ToString() + "," + HGroupID.ToString()
+                        + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+                        + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','Admin',getdate()" +
+                        ")");
+                return true;
             }
             catch (Exception e)
             {

--
Gitblit v1.9.1