From 84b95f066e28ed1b5c8bfc3b7a7837bef578cf91 Mon Sep 17 00:00:00 2001 From: yxj <1qaz@123> Date: 星期四, 03 十一月 2022 14:56:07 +0800 Subject: [PATCH] 新增分步式调出扫源单调用方法,先进先出功能增加按组织控制 --- CLOUDWEB/WebService1.asmx.cs | 223 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 188 insertions(+), 35 deletions(-) diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs index a029f9e..8a2a8fc 100644 --- a/CLOUDWEB/WebService1.asmx.cs +++ b/CLOUDWEB/WebService1.asmx.cs @@ -36645,11 +36645,18 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HOWNERID,ref sErrMsg) == false) { sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return false; } + + //Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + //if (oSystemParameter.ShowBill(ref sErrMsg) == false) + //{ + // sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; + // return false; + //} //褰撳崟鎹弬鏁版槸 澶氬師鍗曟ā寮忔椂锛� 鍒� SourceFlag 璁剧疆涓� TRUE Sc_ICMOReportBill_MulSourceBill if (HBillType == "3711" && oSystemParameter.omodel.Sc_ICMOReportBill_MulSourceBill == "Y") { @@ -37065,17 +37072,17 @@ sErrMsg = "璇锋牴鎹厛杩涘厛鍑烘竻鍗曟壂鐮侊紒"; return false; } - else - { - model.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]); - model.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]); - model.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]); - model.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]); - model.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]); - model.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]); - model.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]); - model.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]); - } + //else + //{ + // model.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]); + // model.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]); + // model.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]); + // model.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]); + // model.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]); + // model.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]); + // model.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]); + // model.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]); + //} } //鐗╂枡鏉$爜鍐欏叆涓存椂琛ㄦ椂锛屽垽鏂粨搴撲粨浣嶆槸鍚︽纭� @@ -40723,7 +40730,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HOWNERID,ref sErrMsg) == false) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忔簮鍗曟椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -40809,7 +40816,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HOWNERID,ref sErrMsg) == false) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忔簮鍗曟椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -40899,7 +40906,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HOWNERID,ref sErrMsg) == false) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忔簮鍗曟椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -40969,7 +40976,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HOWNERID,ref sErrMsg) == false) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忔簮鍗曟椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -40994,7 +41001,7 @@ //鍏堣繘鍏堝嚭鎺у埗 if (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y") //绯荤粺鍙傛暟 鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗 { - DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFO_MoveStock"); + DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFO_MoveStock"); if (FIFO == null || FIFO.Tables[0].Rows.Count == 0) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰复鏃惰〃澶辫触锛�"; @@ -41012,7 +41019,7 @@ //鍏堣繘鍏堝嚭涓嬫灦娓呭崟 else if (oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y") //绯荤粺鍙傛暟 鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭涓嬫灦娓呭崟 { - DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFOList_MoveStock"); + DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFOList_MoveStock"); if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0) { sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰笅鏋舵竻鍗曞け璐ワ紒"; @@ -41046,6 +41053,99 @@ oBar.HSCWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSCWhID"]); oBar.HSCWhName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSCWhName"]); oBar.HSCSPFlag = DBUtility.ClsPub.isBool(ds1.Tables[0].Rows[0]["HSCSPFlag"]); + return oBar; + } + else + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HRemark"]); + return null; + } + } + } + + #endregion + + #region 鍒嗘寮忚皟鍑� 鎵弿婧愬崟鏉$爜 + + [WebMethod] + public Model.ClsKf_ICStockBill_WMS get_SourceBarCode_MoveStockStepOut(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HStockInOrgID, Int64 HStockOutOrgID, ref string sErrMsg) + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + Model.ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS(); + Int64 sMulSourceFlag = 0; //澶氭簮鍗曟爣蹇楋紙0涓洪潪澶氭簮鍗曟ā寮忥紝1涓哄婧愬崟妯″紡锛� + + //鑾峰彇绯荤粺鍙傛暟 + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + if (oSystemParameter.ShowBillByOrgID(HStockOutOrgID, ref sErrMsg) == false) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涙壂鎻忔簮鍗曟椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; + return null; + } + + //绯荤粺鍙傛暟 鐩存帴璋冩嫧鍗�-澶氭簮鍗曟ā寮� + if (oSystemParameter.omodel.Kf_MoveStockStepOutBill_MulSourceBill.ToUpper() == "Y") + { + sMulSourceFlag = 1; + } + + //灏嗘簮鍗曚俊鎭瓨鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛� + DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_MoveStockStepOut " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + sMulSourceFlag.ToString() + ",'" + HMaker + "'," + HFIFOWhID.ToString() + "," + HStockOutOrgID.ToString(), "h_p_WMS_AddSourceBarCode_MoveStockStepOut"); + if (ds1 == null || ds1.Tables[0].Rows.Count == 0) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘皢婧愬崟淇℃伅瀛樺叆鏉$爜鍑哄叆搴撲复鏃惰〃澶辫触锛�"; + return null; + } + else + { + if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0) + { + //鍏堣繘鍏堝嚭鎺у埗 + if (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl == "Y") //绯荤粺鍙傛暟 鍒嗘寮忚皟鍑哄崟-鍏堣繘鍏堝嚭鎺у埗 + { + DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MoveStockStepOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HStockOutOrgID.ToString(), "h_p_WMS_AddSourceFIFO_MoveStockStepOut"); + if (FIFO == null || FIFO.Tables[0].Rows.Count == 0) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰复鏃惰〃澶辫触锛�"; + return null; + } + else + { + if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 1) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]); + return null; + } + } + } + //鍏堣繘鍏堝嚭涓嬫灦娓呭崟 + else if (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList == "Y") //绯荤粺鍙傛暟 鍒嗘寮忚皟鍑哄崟-鍏堣繘鍏堝嚭涓嬫灦娓呭崟 + { + DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_MoveStockStepOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HStockOutOrgID.ToString(), "h_p_WMS_AddSourceFIFOList_MoveStockStepOut"); + if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘瓨鍏ュ厛杩涘厛鍑轰笅鏋舵竻鍗曞け璐ワ紒"; + return null; + } + else + { + if (DBUtility.ClsPub.isLong(FIFOList.Tables[0].Rows[0][0]) == 1) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(FIFOList.Tables[0].Rows[0]["HRemark"]); + return null; + } + } + } + oBar.HBarType = "婧愬崟鏉$爜"; + oBar.HMulSourceFlag = sMulSourceFlag; + oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillType"]); + oBar.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillNo"]); + oBar.HDeptID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HDeptID"]); + oBar.HDeptName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HDeptName"]); + oBar.HStockOutOrgID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HStockOutOrgID"]); + oBar.HStockOutOrgName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HStockOutOrgName"]); + oBar.HStockInOrgID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HStockInOrgID"]); + oBar.HStockInOrgName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HStockInOrgName"]); + oBar.HStockStyle = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HStockStyle"]); return oBar; } else @@ -41137,7 +41237,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == false) { sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -42250,7 +42350,7 @@ //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == false) { sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -43164,7 +43264,7 @@ { //鑾峰彇绯荤粺鍙傛暟 Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); - if (oSystemParameter.ShowBill(ref sErrMsg) == false) + if (oSystemParameter.ShowBillByOrgID(HStockOutOrgID,ref sErrMsg) == false) { sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; return null; @@ -43595,8 +43695,7 @@ oMain.HOWNERID = HStockInOrgID; //鍏堣繘鍏堝嚭鎺у埗 - if ((HBillType == "1207" && oSystemParameterMain.Kf_MoveStockBill_FIFOCtl == "Y") //绯荤粺鍙傛暟 鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗 - ) + if (HBillType != "1251" && sFIFOCtl == "Y") { DataSet FIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HBillID.ToString() + ",'" + HBillType + "','" + oMain.HBatchNo + "','" + oMain.HBarCode + "'," + oMain.HQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode"); if (FIFO == null || FIFO.Tables[0].Rows.Count == 0) @@ -43604,17 +43703,17 @@ sErrMsg = "璇锋牴鎹厛杩涘厛鍑烘竻鍗曟壂鐮侊紒"; return false; } - else - { - oMain.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]); - oMain.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]); - oMain.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]); - oMain.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]); - oMain.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]); - oMain.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]); - oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]); - oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]); - } + //else + //{ + // oMain.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]); + // oMain.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]); + // oMain.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]); + // oMain.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]); + // oMain.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]); + // oMain.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]); + // oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]); + // oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]); + //} } oCn.RunProc("Insert into KF_PonderationBillMain_Temp " + @@ -43635,7 +43734,7 @@ return true; } - //鎵弿鐗╂枡鏉$爜 瀛樺叆鏉$爜鍑哄叆搴撲复鏃惰〃 璋冩嫧 + //鎵弿鐗╂枡鏉$爜 瀛樺叆鏉$爜鍑哄叆搴撲复鏃惰〃 璋冩嫧 妫シ涓撶敤 [WebMethod] public bool set_SavePonderationBillMain_Temp_BarCode_MoveStock_SenKai(Model.ClsGy_BarCodeBill_WMS_Model_View omodel_View, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) { @@ -44381,6 +44480,60 @@ return DS; } + //鏄剧ず鐗╂枡鏄庣粏鍒楄〃銆佹ā娌诲叿鍒楄〃銆佸厛杩涘厛鍑哄垪琛ㄤ俊鎭�(鏍规嵁缁勭粐鑾峰彇绯荤粺鍙傛暟) + [WebMethod] + public DataSet GetBillEntryTmpList(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg) + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + string sSimpleMode = "N"; //鏄惁鍚敤鎵爜绠�鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N) + + //鑾峰彇绯荤粺鍙傛暟 + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == false) + { + sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涜繑鍥炵墿鏂欐槑缁嗗垪琛ㄦ椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg; + return null; + } + + //鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠$悊(Y,N) + if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //鍚敤妯℃不鍏风鐞� + { + sMouldManagerCtl = "Y"; + } + + //鍒ゆ柇鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊(Y,N)锛屾槸鍚﹀惎鐢ㄦ壂鐮佺畝鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N) + if (HBillType == "1204") //鐢熶骇棰嗘枡鍗� + { + if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MateOutBill_FIFOList == "Y") //鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗 + { + sFIFOCtl = "Y"; + } + if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //鐢熶骇棰嗘枡鍗�-鎵爜绠�鏄撴ā寮� + { + sSimpleMode = "Y"; + } + } + else if (HBillType == "1205" && (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_SellOutBill_FIFOList == "Y")) //閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗 + { + sFIFOCtl = "Y"; + } + else if (HBillType == "1211" && (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList == "Y")) //濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗 + { + sFIFOCtl = "Y"; + } + else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y")) //鐩存帴璋冩嫧鍗�-鍏堣繘鍏堝嚭鎺у埗 + { + sFIFOCtl = "Y"; + } + else if (HBillType == "1250" && (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl == "Y" || oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList == "Y")) //鍒嗘寮忚皟鍑哄崟-鍏堣繘鍏堝嚭鎺у埗 + { + sFIFOCtl = "Y"; + } + + DataSet DS = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList"); + return DS; + } + #endregion -- Gitblit v1.9.1