From 4eb275c1116ad1cff4b397781785a2ce7971877b Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 29 十二月 2025 08:52:02 +0800
Subject: [PATCH] 新增校验模块相关系统参数,校验扫码模块相关调用方法优化,新增先进先出功能等

---
 WebAPI/Controllers/条码管理/WEBSController.cs |  223 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 213 insertions(+), 10 deletions(-)

diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 34e16f8..bb34737 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -6809,10 +6809,10 @@
 
         #endregion
 
-        #region 鎵弿鍗曟嵁鏉$爜  鍑哄叆搴撴ā鍧�
+        #region 鎵弿鍗曟嵁鏉$爜   20251225
 
         /// <summary>
-        /// 鎵弿鍗曟嵁鏉$爜  鍑哄叆搴撴ā鍧�   鏍¢獙妯″紡
+        /// 鎵弿鍗曟嵁鏉$爜   鏍¢獙妯″紡
         /// </summary>
         /// <returns></returns>
         [Route("WEBSController/get_BillBarCode_BillCheck_Json")]
@@ -6851,7 +6851,7 @@
 
         #endregion
 
-        #region 鎵弿鍗曟嵁鏉$爜  宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁   20241216
+        #region 鎵弿鍗曟嵁鏉$爜  宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁   20251225
 
         /// <summary>
         /// 宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
@@ -6893,7 +6893,7 @@
 
         #endregion
 
-        #region 鎵弿鐗╂枡鏉$爜  鍑哄叆搴撴ā鍧�
+        #region 鎵弿鐗╂枡鏉$爜   20251225
 
         /// <summary>
         /// 鐗╂枡鏉$爜鏂囨湰妗� 鏍¢獙鎵爜璋冪敤  鏍¢獙妯″紡
@@ -6901,7 +6901,7 @@
         /// <returns></returns>
         [Route("WEBSController/get_CheckTypeByBarCode_BillCheck_Json")]
         [HttpGet]
-        public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, Int64 HStockOrgID)
+        public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, Int64 HStockOrgID)
         {
             //鑾峰彇绯荤粺鍙傛暟
             string sErrMsg = "";
@@ -7097,11 +7097,19 @@
                     //鍘熷崟鎹潪鎵爜鐢熸垚锛屾牎楠屾椂鐢熸垚鏉$爜璁板綍
                     else
                     {
-                        WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+                        WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck_New(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                         if (WebSoBar == null)
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 0;
+                            objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else if (WebSoBar.HRemark == "浠呮彁绀�")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 2;
                             objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                             objJsonResult.data = null;
                             return objJsonResult;
@@ -7137,7 +7145,71 @@
 
         #endregion
 
-        #region 杩斿洖鍗曟嵁鍒楄〃淇℃伅    20241114
+        #region 鎵弿鐗╂枡鏉$爜  鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉$爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓厑璁告壂鎻忓啓鍏�   20251225
+
+        /// <summary>
+        /// 鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉$爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓�  瀛樺叆鏉$爜鍑哄叆搴撲复鏃惰〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json")]
+        [HttpGet]
+        public Object get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, Int64 HStockOrgID)
+        {
+            //鑾峰彇绯荤粺鍙傛暟
+            string sErrMsg = "";
+            string sJXCode = "";
+            if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
+            {
+                if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                {
+                    sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
+                }
+                else
+                {
+                    sJXCode = sBarCode;
+                }
+                try
+                {
+                    WebSoBar = oWebs.get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+                    if (WebSoBar == null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鎴愬姛";
+                        objJsonResult.data = WebSoBar;
+                        return objJsonResult;
+                    }
+                }
+                catch (Exception e)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏍¢獙妯″紡锛屾壂鎻忔潯鐮佸け璐ワ紒" + e.ToString();
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
+        #region 杩斿洖鍗曟嵁鍒楄〃淇℃伅    20251225
 
         /// <summary>
         /// 杩斿洖鍗曟嵁鍒楄〃淇℃伅    鏍¢獙妯″紡
@@ -7184,7 +7256,8 @@
                     objJsonResult.data = new
                     {
                         Materlist = ds.Tables[0],           //杩斿洖鐗╂枡鏄庣粏鍒楄〃淇℃伅锛�0锛�
-                        BarCodeDetailslist = ds.Tables[1],  //杩斿洖褰撳墠鎵�鎵弿鏉$爜鏄庣粏淇℃伅锛�5锛�
+                        BarCodeDetailslist = ds.Tables[1],  //杩斿洖褰撳墠鎵�鎵弿鏉$爜鏄庣粏淇℃伅锛�1锛�
+                        FIFOlist = ds.Tables[2],            //杩斿洖鍏堣繘鍏堝嚭鍒楄〃淇℃伅锛�2锛�
                     };
                     objJsonResult.list = columnNameList;
                     return objJsonResult;
@@ -7253,7 +7326,7 @@
 
         #endregion
 
-        #region 鏍¢獙鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰�    20241114
+        #region 鏍¢獙鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰�    20251225
 
         /// <summary>
         /// 鎵爜妯″潡锛屽垹闄ら�変腑琛屾潯鐮佸嚭鍏ュ簱涓存椂琛ㄨ褰�
@@ -7361,6 +7434,115 @@
 
         #endregion
 
+        #region 鎵爜妯″潡    閫�鍑哄姛鑳芥寜閽皟鐢�    鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�  20251225
+
+        /// <summary>
+        /// 鎵爜妯″潡锛岄��鍑烘椂鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬� HlineStatus
+        /// </summary>
+        /// <returns></returns>
+        [Route("WEBSController/set_UPDateFIFOTmp_BillCheck_Json")]
+        [HttpGet]
+        public object set_UPDateFIFOTmp_BillCheck_Json(long HInterID, string HBillType, Int64 HStockOrgID)
+        {
+            //鑾峰彇绯荤粺鍙傛暟
+            string sErrMsg = "";
+            if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
+            {
+                string sFIFOCtl = "N";          //鍏堣繘鍏堝嚭鎺у埗锛�1銆佷笉鎺у埗浠呮樉绀轰笅鏋舵竻鍗� 2銆佷弗鏍兼帶鍒跺厛杩涘厛鍑� 3銆佷粎鎻愮ず鍜屾樉绀轰笅鏋舵竻鍗� 4銆佷笉鏄剧ず涓嬫灦娓呭崟涔熶笉鎺у埗锛�
+
+                #region 绯荤粺鍙傛暟鑾峰彇
+                //鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1204" 
+                    && oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1205"
+                    && oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //鍏朵粬鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1206"
+                    && oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1211"
+                    && oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //鐢熶骇琛ユ枡鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1254"
+                    && oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //濮斿琛ユ枡鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1255"
+                    && oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                //鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗
+                if (HBillType == "1207"
+                    && oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "N"         //鍏嶆壂鐗╂枡鏉$爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
+                    && oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "N"    //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                    && (oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "3"))
+                {
+                    sFIFOCtl = "Y";
+                }
+                #endregion
+
+                try
+                {
+                    if (sFIFOCtl == "Y")
+                    {
+                        //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬�
+                        oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp_BillCheck " + HInterID.ToString() + ",'" + HBillType + "'");
+                    }
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //鎴愬姛锛�
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                catch (Exception e)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏇存柊鍏堣繘鍏堝嚭涓存椂琛℉lineStatus鍊煎け璐ワ紒" + e.ToString();
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
         #region 鏍¢獙缂撳瓨妯″潡    杩斿洖缂撳瓨鍒楄〃淇℃伅
 
         /// <summary>
@@ -7412,7 +7594,7 @@
 
         #endregion
 
-        #region 鏍¢獙缂撳瓨妯″潡    鏍规嵁鍗曟嵁ID,鍒犻櫎涓存椂琛ㄨ褰�    20241216
+        #region 鏍¢獙缂撳瓨妯″潡    鏍规嵁鍗曟嵁ID,鍒犻櫎涓存椂琛ㄨ褰�    20251225
 
         /// <summary>
         /// 鏍规嵁鍗曟嵁ID,鍒犻櫎涓存椂琛ㄨ褰�
@@ -7429,6 +7611,7 @@
             if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
             {
                 string sSourceBarCodeCtl = "N";   //鏍¢獙-鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+                string sFIFOCtl = "4";              //鍏堣繘鍏堝嚭鎺у埗锛�1銆佷笉鎺у埗浠呮樉绀轰笅鏋舵竻鍗� 2銆佷弗鏍兼帶鍒跺厛杩涘厛鍑� 3銆佷粎鎻愮ず鍜屾樉绀轰笅鏋舵竻鍗� 4銆佷笉鏄剧ず涓嬫灦娓呭崟涔熶笉鎺у埗锛�
 
                 #region 绯荤粺鍙傛暟鑾峰彇
                 //閲囪喘鍏ュ簱鍗�
@@ -7466,6 +7649,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl;
                 }
                 //閿�鍞嚭搴撳崟
                 else if (HBillType == "1205")
@@ -7475,6 +7660,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl;
                 }
                 //鍏朵粬鍑哄簱鍗�
                 else if (HBillType == "1206")
@@ -7484,6 +7671,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl;
                 }
                 //濮斿棰嗘枡鍗�
                 else if (HBillType == "1211")
@@ -7493,6 +7682,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl;
                 }
                 //鐢熶骇琛ユ枡鍗�
                 else if (HBillType == "1254")
@@ -7502,6 +7693,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl;
                 }
                 //濮斿琛ユ枡鍗�
                 else if (HBillType == "1255")
@@ -7511,6 +7704,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl;
                 }
                 //鐩存帴璋冩嫧鍗�
                 else if (HBillType == "1207")
@@ -7520,6 +7715,8 @@
                     {
                         sSourceBarCodeCtl = "Y";
                     }
+                    //鍏堣繘鍏堝嚭鎺у埗
+                    sFIFOCtl = oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl;
                 }
                 #endregion
 
@@ -7557,6 +7754,12 @@
                     try
                     {
                         oCn.BeginTran();
+                        //鍒犻櫎鍏堣繘鍏堝嚭涓存椂琛ㄨ褰�
+                        if (sFIFOCtl == "1" || sFIFOCtl == "2" || sFIFOCtl == "3")
+                        {
+                            oCn.RunProc("Delete from Kf_ICInventory_FIFO_Tmp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+                        }
+                        //鍒犻櫎鏉$爜鍑哄叆搴撲复鏃惰〃璁板綍
                         oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSubBillType=1", ref DBUtility.ClsPub.sExeReturnInfo);
                         //鍐欏叆鏃ュ織
                         oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +

--
Gitblit v1.9.1