From 67c89aabb2c514b62f5006b44deeeede8aa55f99 Mon Sep 17 00:00:00 2001 From: "LAPTOP-L19E5NHR\\Administrator" Date: Mon, 15 May 2023 19:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ICS.CreateIssueIN/CreateIssue.cs | 63 +++++++------- .../CustCreateBFRTNSrvSub.cs | 82 ++++++++++++++----- .../ICS.CustCreateBFRTNSrvSub.csproj | 3 + ICSSoft.U8.WebAPI/Web.config | 39 ++++++++- UFIDA.ISV.CreateMO/CustCreateMO.cs | 8 +- 5 files changed, 135 insertions(+), 60 deletions(-) diff --git a/ICS.CreateIssueIN/CreateIssue.cs b/ICS.CreateIssueIN/CreateIssue.cs index 6ea8691..e99800e 100644 --- a/ICS.CreateIssueIN/CreateIssue.cs +++ b/ICS.CreateIssueIN/CreateIssue.cs @@ -16,7 +16,7 @@ namespace ICS.CreateIssueIN { public class CreateIssue { - private static string ORGCode = ConfigurationManager.AppSettings["orgCode"].ToString(); + //private static string ORGCode = ConfigurationManager.AppSettings["orgCode"].ToString(); public OperationResult CreateIssue1(List modellist) { OperationResult result = new OperationResult(); @@ -28,7 +28,8 @@ namespace ICS.CreateIssueIN beginstrlog.AppendLine("*****************************************************"); foreach (var model in modellist) { - beginstrlog.AppendLine("生产订单:" + model.MOCODE); + beginstrlog.AppendLine("生产订单:" + model.MOCODE); + beginstrlog.AppendLine("组织:" + model.OrgCode); foreach (var item in model.linelist) { @@ -51,7 +52,7 @@ namespace ICS.CreateIssueIN StringBuilder str = new StringBuilder(); - + string ORGCode = modellist[0].OrgCode; string OrgID = ""; OrgID = Appconfig.IsExistsCode(ORGCode, "Base_Organization"); @@ -149,13 +150,11 @@ namespace ICS.CreateIssueIN foreach (IssueDatas line in model.linelist) { - string ORGID = Appconfig.IsExistsCode(line.ORGCODE, "Base_Organization"); - - if (string.IsNullOrEmpty(ORGID)) - { - throw new Exception("组织编码：" + line.ORGCODE + "在U9中不存在。"); - } - + //string ORGID = Appconfig.IsExistsCode(line.ORGCODE, "Base_Organization"); + //if (string.IsNullOrEmpty(ORGID)) + //{ + // throw new Exception("组织编码：" + line.ORGCODE + "在U9中不存在。"); + //} pick.m_aCDType = 0; @@ -171,9 +170,9 @@ namespace ICS.CreateIssueIN // 料品 string itemid = ""; - orgsql = @"select id from CBO_ItemMaster where code=='{0}'"; + orgsql = @"select id from CBO_ItemMaster where code='{0}'"; orgsql = string.Format(orgsql, line.ITEM); - orgdt = DBhlper.Query(orgsql, Appconfig.GetU9ConnStr()); + orgdt = DBhlper.Query(orgsql, Appconfig.GetU9ConnStr()); if (orgdt.Rows.Count != 0) itemid = orgdt.Rows[0]["ID"].ToString(); else @@ -198,13 +197,13 @@ namespace ICS.CreateIssueIN // 应发数量 pick.m_issueQty = Convert.ToDecimal(line.ActualReqQty); //存储地点 - if (Appconfig.GetWhCodeByBinid(line.WH, ORGID) != "") - { - UFIDAU9CBOPubControllerCommonArchiveDataDTOData ww = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData(); - mo.m_iD = Convert.ToInt64(Appconfig.GetWhCodeByBinid(line.WH, ORGID)); - mo.m_code = line.WH; - pick.m_issueWh = ww; - } + //if (Appconfig.GetWhCodeByBinid(line.WH, ORGID) != "") + //{ + // UFIDAU9CBOPubControllerCommonArchiveDataDTOData ww = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData(); + // mo.m_iD = Convert.ToInt64(Appconfig.GetWhCodeByBinid(line.WH, ORGID)); + // mo.m_code = line.WH; + // pick.m_issueWh = ww; + //} // 批号 //弹性栏位： //pickListDTO.DescFlexField = new DescFlexSegmentsData(); @@ -213,21 +212,21 @@ namespace ICS.CreateIssueIN //pickListDTO.MOPickList = moPickList.ID; // 货主组织 UFIDAU9CBOPubControllerCommonArchiveDataDTOData org = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData(); - mo.m_iD = Convert.ToInt64(ORGID); - mo.m_code = line.ORGCODE; + mo.m_iD =long.Parse( OrgID); + mo.m_code = ORGCode;// line.ORGCODE; pick.m_ownerOrg = org; //库位 //子料项目号 - if (!string.IsNullOrEmpty(line.Project)) - { - if (Appconfig.GetProjectid(line.Project, ORGID) != "") - { - UFIDAU9CBOPubControllerCommonArchiveDataDTOData project = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData(); - mo.m_iD = Convert.ToInt64(Appconfig.GetProjectid(line.Project, ORGID)); - mo.m_code = line.Project; - pick.m_project = project; - } - } + //if (!string.IsNullOrEmpty(line.Project)) + //{ + // if (Appconfig.GetProjectid(line.Project, ORGID) != "") + // { + // UFIDAU9CBOPubControllerCommonArchiveDataDTOData project = new UFIDAU9CBOPubControllerCommonArchiveDataDTOData(); + // mo.m_iD = Convert.ToInt64(Appconfig.GetProjectid(line.Project, ORGID)); + // mo.m_code = line.Project; + // pick.m_project = project; + // } + //} pick.m_issueDocLineID = 1; picklst.Add(pick); } @@ -341,7 +340,7 @@ namespace ICS.CreateIssueIN public class IssueData { public string MOCODE { get; set; } - public string DOCNO { get; set; } + public string OrgCode { get; set; } public string memo { get; set; } public List linelist { get; set; } diff --git a/ICS.CustCreateBFRTNSrvSub/CustCreateBFRTNSrvSub.cs b/ICS.CustCreateBFRTNSrvSub/CustCreateBFRTNSrvSub.cs index da74e85..685f40e 100644 --- a/ICS.CustCreateBFRTNSrvSub/CustCreateBFRTNSrvSub.cs +++ b/ICS.CustCreateBFRTNSrvSub/CustCreateBFRTNSrvSub.cs @@ -120,7 +120,7 @@ namespace UFIDA.ISV.CreateBFRTN rCV.m_transQty.m_amount1 = line.ReqQty; rCV.m_transQty.m_amount2 = decimal.Zero; - + string sqlWH = @"select Code from CBO_Wh WHERE Code='" + line.WhCode + "' "; @@ -143,6 +143,22 @@ namespace UFIDA.ISV.CreateBFRTN rCV.m_rcvLineInfoDTO = new UFIDAU9ISVRCVDTORcvLineInfoDTOData(); rCV.m_rcvLineInfoDTO.m_whCode = WHCode; + + string sqlOper = @"select id,a.dept from CBO_Operators a where code='adminck' "; + sqlOper = string.Format(sqlOper); + DataTable _dtOper = DBhlper.Query(sqlOper, Appconfig.GetU9ConnStr()); + string operID = string.Empty; + string operDept = string.Empty; + + if (_dtOper != null && _dtOper.Rows.Count > 0) + { + operID = _dtOper.Rows[0][0].ToString(); + operDept = _dtOper.Rows[0][1].ToString(); + rCV.m_rcvLineInfoDTO.WhMan =long.Parse( operID); + rCV.m_rcvLineInfoDTO.m_whManCode = "adminck"; + } + + //库位 rCV.m_rcvLineInfoDTO.m_lineLocations = new UFIDAU9ISVRCVDTOOBARcvLineLocationDTOData[] { }; @@ -155,28 +171,52 @@ namespace UFIDA.ISV.CreateBFRTN location.m_locationQtySU = line.ReqQty; location.m_locationQtyTU = line.ReqQty; + + if (!string.IsNullOrWhiteSpace(line.RcvLot)) + { + strlog.AppendLine("开始调用创建批号接口------------"); + string OrgID = string.Empty; + string OrgIDSQL = "SELECT a.Org FROM PM_PurchaseOrder a where DocNo='" + rCVhead.srcDocPONo + "'"; + DataTable dtOrgID = DBhlper.Query(OrgIDSQL, Appconfig.GetU9ConnStr()); + if (dtOrgID.Rows.Count > 0) + { + OrgID = dtOrgID.Rows[0][0].ToString(); + } + string LotID = ""; + //创建批号 + //UFIDA.ISV.CreateLotMaster.CustCreateLotMaster createLot = new CreateLotMaster.CustCreateLotMaster(); + //UFIDA.ISV.CreateLotMaster.CustCreateLotMaster.LotMaster lot = new CreateLotMaster.CustCreateLotMaster.LotMaster(); + //lot.ItemCode = line.ItemCode; + //lot.LotCode = line.RcvLot; + //UFIDA.ISV.CreateLotMaster.CustCreateLotMaster.OperationResule result = createLot.CustCreateRCVLotMaster(lot); + UFIDA.ISV.CreateLotMaster.CustCreateLotMaster LotMasterCreate = new UFIDA.ISV.CreateLotMaster.CustCreateLotMaster(); + string lotWHCode = line.WhCode; + string lotItemCode = line.ItemCode; + string LotCode = line.RcvLot; + LotMasterCreate.CustCreateRCVLotMaster(lotWHCode, lotItemCode, LotCode, DateTime.Now, OrgID, ref LotID); + if (LotID == "") + { + rtnRcvInfo rtnpo = new rtnRcvInfo(); + rtnpo.IsSuccess = false; + rtnpo.Message = "批号创建失败"; + rtnpos.Add(rtnpo); + return rtnpos; + } - //if (!string.IsNullOrWhiteSpace(line.RcvLot)) - //{ - // strlog.AppendLine("开始调用创建批号接口------------"); - // //创建批号 - // UFIDA.ISV.CreateLotMaster.CustCreateLotMaster createLot = new CreateLotMaster.CustCreateLotMaster(); - // UFIDA.ISV.CreateLotMaster.CustCreateLotMaster.LotMaster lot = new CreateLotMaster.CustCreateLotMaster.LotMaster(); - // lot.ItemCode = line.ItemCode; - // lot.LotCode = line.RcvLot; - // UFIDA.ISV.CreateLotMaster.CustCreateLotMaster.OperationResule result = createLot.CustCreateRCVLotMaster(lot); - - // if (result.IsSuccess) - // { - // rCV.m_rcvLineInfoDTO.m_invLotCode = result.DocNo; - // strlog.AppendLine("创建批号接口成功------------"); - // } - // else - // { - // strlog.AppendLine("创建批号接口失败------------"); - // } - //} + if (!string.IsNullOrWhiteSpace(LotID)) + { + //rCV.m_rcvLineInfoDTO.m_invLotCode = result.DocNo; + rCV.m_rcvLineInfoDTO.m_invLotCode = LotCode; + + strlog.AppendLine("创建批号接口成功------------"); + } + else + { + strlog.AppendLine("创建批号接口失败------------"); + } + } + //rCV.m_rcvLineInfoDTO.m_invLotCode = line.RcvLot; locationList.Add(location); rCV.m_rcvLineInfoDTO.m_lineLocations = locationList.ToArray(); rCVList.Add(rCV); diff --git a/ICS.CustCreateBFRTNSrvSub/ICS.CustCreateBFRTNSrvSub.csproj b/ICS.CustCreateBFRTNSrvSub/ICS.CustCreateBFRTNSrvSub.csproj index 81be8bb..c2788c9 100644 --- a/ICS.CustCreateBFRTNSrvSub/ICS.CustCreateBFRTNSrvSub.csproj +++ b/ICS.CustCreateBFRTNSrvSub/ICS.CustCreateBFRTNSrvSub.csproj @@ -48,6 +48,9 @@ + + ..\UFIDA.ISV.CreateLotMaster\bin\Debug\UFIDA.ISV.CreateLotMaster.dll + diff --git a/ICSSoft.U8.WebAPI/Web.config b/ICSSoft.U8.WebAPI/Web.config index 104c8ed..4993aeb 100644 --- a/ICSSoft.U8.WebAPI/Web.config +++ b/ICSSoft.U8.WebAPI/Web.config @@ -68,7 +68,7 @@ - + @@ -529,8 +529,35 @@ - - + + + + + + + + + + + + + + @@ -578,6 +605,12 @@ + +