diff --git a/ICS.CreateSOReturnRCV/CustCreateSOReturnRcvSrvSub.cs b/ICS.CreateSOReturnRCV/CustCreateSOReturnRcvSrvSub.cs index ca8fb9e..d6a98bc 100644 --- a/ICS.CreateSOReturnRCV/CustCreateSOReturnRcvSrvSub.cs +++ b/ICS.CreateSOReturnRCV/CustCreateSOReturnRcvSrvSub.cs @@ -174,7 +174,14 @@ namespace UFIDA.ISV.CreateSOReturnRCV rtnpos.Add(rtnpo); return rtnpos; } - + if (line.RcvLot == "") + { + rtnRcvInfo rtnpo = new rtnRcvInfo(); + rtnpo.IsSuccess = false; + rtnpo.Message = "批号不能为空"; + rtnpos.Add(rtnpo); + return rtnpos; + } else { string usersql = @"select ID from CBO_Operators @@ -297,6 +304,7 @@ namespace UFIDA.ISV.CreateSOReturnRCV //if (line.ReqQty > 0 && line.ReqQty <= PlanQTY - HasQTY) //{ UFIDAU9ISVRCVSMToRcvDTOData RE = new UFIDAU9ISVRCVSMToRcvDTOData(); + RE.m_srcDocType = 8; RE.m_srcDocNo = rCVhead.srcDocPONo; RE.m_srcDocLineNo = line.srcDocPOLineNo.ToString(); @@ -304,9 +312,9 @@ namespace UFIDA.ISV.CreateSOReturnRCV //数量 RE.m_transQty = new UFIDAU9CBODTOsDoubleQuantityData(); - + RE.m_transQty.m_amount1 = line.ReqQty; - + #region 获取仓库信息 string sqlWH = @"select ID,Code from CBO_Wh WHERE Code='" + line.WhCode + "' "; @@ -348,11 +356,14 @@ namespace UFIDA.ISV.CreateSOReturnRCV //} //#endregion RE.m_rcvLineInfoDTO = new UFIDAU9ISVRCVDTORcvLineInfoDTOData(); - //RE.m_rcvLineInfoDTO.m_invLotCode = line.RcvLot; + RE.m_rcvLineInfoDTO.m_invLotCode = line.RcvLot; RE.m_rcvLineInfoDTO.m_storageType = 4; RE.m_rcvLineInfoDTO.m_docLineNo = Count; RE.m_rcvLineInfoDTO.Wh = WHID; RE.m_rcvLineInfoDTO.m_whCode = WHCode; + RE.m_rcvLineInfoDTO.m_whManCode = "admin"; + + //rCV.m_pOShipLineNo = 10; //库位 @@ -367,7 +378,7 @@ namespace UFIDA.ISV.CreateSOReturnRCV strlog.AppendLine("料品编码(ItemCode):" + line.ItemCode); strlog.AppendLine("料品数量(ReqQty):" + line.ReqQty); strlog.AppendLine("仓库(WHCode):" + WHCode); - //strlog.AppendLine("库存批号(RcvLot):" + line.RcvLot); + strlog.AppendLine("库存批号(RcvLot):" + line.RcvLot); strlog.AppendLine("用户编号(UserCode):" + line.UserCode); strlog.AppendLine("组织编号(FurnaceNo):" + line.FurnaceNo); @@ -456,7 +467,7 @@ namespace UFIDA.ISV.CreateSOReturnRCV strlog.AppendLine("料品编码:" + line.ItemCode); strlog.AppendLine("料品数量:" + line.ReqQty); strlog.AppendLine("仓库:" + line.WhCode); - //strlog.AppendLine("库存批号:" + line.RcvLot); + strlog.AppendLine("库存批号:" + line.RcvLot); strlog.AppendLine("用户编号:" + line.UserCode); strlog.AppendLine("组织编号:" + line.FurnaceNo); } @@ -561,7 +572,7 @@ namespace UFIDA.ISV.CreateSOReturnRCV /// /// 库存批号 /// - //public string RcvLot { get; set; } + public string RcvLot { get; set; } /// /// 业务员ID /// diff --git a/UFIDA.ISV.CreateTransferINForJOB/CustCreateTransferINForJOB.cs b/UFIDA.ISV.CreateTransferINForJOB/CustCreateTransferINForJOB.cs index 5fa1209..b7d9eb9 100644 --- a/UFIDA.ISV.CreateTransferINForJOB/CustCreateTransferINForJOB.cs +++ b/UFIDA.ISV.CreateTransferINForJOB/CustCreateTransferINForJOB.cs @@ -193,12 +193,12 @@ namespace UFIDA.ISV.CreateTransferINForJOB if (whdt.Rows.Count == 0) { strlog.AppendLine("*****************************************************"); - strlog.AppendLine("错误消息:传入的调出仓库编码:'" + line.INWhCode + "'在U9中不存在"); + strlog.AppendLine("错误消息:传入的调出仓库编码:'" + line.OutWhCode + "'在U9中不存在"); strlog.AppendLine("*****************************************************"); Appconfig.WriteLogFile(strlog.ToString(), "WMSJOB自动创建调拨单"); res.IsSuccess = false; - res.MESSAGE = "传入的调出仓库编码:'" + line.INWhCode + "'在U9中不存在"; + res.MESSAGE = "传入的调出仓库编码:'" + line.OutWhCode + "'在U9中不存在"; return res; }