diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/App.config b/ICSSoft.FromERP/ICSSoft.FromERP/App.config index 080e21d..636250b 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/App.config +++ b/ICSSoft.FromERP/ICSSoft.FromERP/App.config @@ -8,8 +8,8 @@ - - + + @@ -20,10 +20,10 @@ - + - + diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs index 09cdba2..0a2deac 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs @@ -117,7 +117,7 @@ namespace ICSSoft.FromERP { Extensionline.Brand = "";//销售凭证项目 Extensionline.ProjectCode = "";//销售凭证 - } + } Extensionline.cFree1 = ""; Extensionline.cFree2 = ""; Extensionline.cFree3 = ""; @@ -153,7 +153,7 @@ namespace ICSSoft.FromERP rcvline.InvCode = Item.MATNR.TrimStart('0');//物料编码 LineNum = (Convert.ToInt32(LineNum) + 10).ToString(); } - + rcvline.VenCode = HeadInfo.LIFNR;//供应商 rcvline.DepCode = HeadInfo.NAME1;//供应商名称 rcvline.DNType = "1"; @@ -163,7 +163,8 @@ namespace ICSSoft.FromERP rcvline.POID = HeadInfo.AUFNR;//订单号 rcvline.DNID = HeadInfo.EBELN;//采购凭证号 rcvline.DNDetailID = HeadInfo.EBELP;//采购凭证的项目 - rcvline.Quantity = Item.HGMENGE;//合格数量 L_LME//可入库数量 + rcvline.Quantity = Item.HGMENGE;//合格数量 + rcvline.SAPSequence = Item.L_LME.ToString();//可入库数量 rcvline.Amount = 0; rcvline.WHCode = Item.LGORT;//仓库 //库存地点 rcvline.Status = "2"; @@ -173,10 +174,10 @@ namespace ICSSoft.FromERP rcvline.MTIME = DateTime.Now; rcvline.ExtensionID = ExtensionID; //新增字段 - rcvline.InspectionType =HeadInfo.ART;//检验类型 + rcvline.InspectionType = HeadInfo.ART;//检验类型 rcvline.InvoDescribe = Item.MAKTX;//物料描述 rcvline.Unity = Item.MEINS;//单位 - rcvline.StockIndicator =Item.SOBKZ;//特殊库存标识 + rcvline.StockIndicator = Item.SOBKZ;//特殊库存标识 rcvline.DepositArea = Item.LTKZA;//存放区域 rcvline.ModificationDate = HeadInfo.TEST1;//检验修改日期 rcvline.TrackingNumber = HeadInfo.TEST2;//需求跟踪号 diff --git a/ICSSoft.FromERP/ICSSoft.Test/Program.cs b/ICSSoft.FromERP/ICSSoft.Test/Program.cs index 299df05..0ea5d53 100644 --- a/ICSSoft.FromERP/ICSSoft.Test/Program.cs +++ b/ICSSoft.FromERP/ICSSoft.Test/Program.cs @@ -22,7 +22,7 @@ namespace ICSSoft.Test //ICSWareHouseLotInfoDoc test = new ICSWareHouseLotInfoDoc(); //test.Execute(); - ICSSAPDocGet test = new ICSSAPDocGet(); + ICSDeliveryNotice test = new ICSDeliveryNotice(); test.Execute(); } diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll index 7ad6e81..16257cb 100644 Binary files a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll and b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll differ diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs index f082281..2b631af 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs @@ -1559,7 +1559,7 @@ namespace ICSSoft.DataProject where TransCode='{0}' AND WorkPoint='{1}' and TransType=15"; sql = string.Format(sql, TransCode, WorkPoint); dt = DBHelper.SQlReturnData(sql, cmd); - foreach (DataRow dr in chkdt.Rows) + foreach (DataRow dr in dt.Rows) { sql += @" update ICSWareHouseLotInfo set LockQuantity=CONVERT(decimal(18,6),LockQuantity)-{0} where LotNo='{1}' AND WorkPoint='{2}' "; diff --git a/WMS-BS/NFine.Application/WMS/DeciliterApp.cs b/WMS-BS/NFine.Application/WMS/DeciliterApp.cs index 97a735c..c2d84b1 100644 --- a/WMS-BS/NFine.Application/WMS/DeciliterApp.cs +++ b/WMS-BS/NFine.Application/WMS/DeciliterApp.cs @@ -54,53 +54,52 @@ namespace NFine.Application.WMS string user = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; string userName = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName; var models = Parameter.ToObject>().FirstOrDefault(); - StringBuilder sqlString = new StringBuilder(); - - if (models.LotNo == null || models.detail == null) - { - msg = "拆分失败，拆分数据不能为空"; - return msg; - } - foreach (var mode in models.detail) - { - sqlString.Append($@" INSERT INTO ICSInventoryLot (ID,LotNo,InvCode,ProductDate,ExpirationDate,Quantity,Amount,ExtensionID,Type,PrintTimes,LastPrintUser, - LastPrintTime,MUSER,MUSERName,MTIME,WorkPoint,EATTRIBUTE1 ) - SELECT NEWID(),'{mode.CurrentLotNo}',InvCode,ProductDate,ExpirationDate,CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}),Amount,ExtensionID,Type,PrintTimes, - LastPrintUser,LastPrintTime,'{user}','{userName}','{models.MTIME}',WorkPoint,'{models.LotNo}' - FROM ICSInventoryLot - WHERE LotNo='{models.LotNo}' "); - sqlString.Append($@" INSERT INTO ICSWareHouseLotInfo - SELECT - NEWID(), '{mode.CurrentLotNo}', WarehouseCode, LocationCode, InvCode, CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}), InDate, LockQuantity, '{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1 - FROM ICSWareHouseLotInfo - WHERE LotNo='{models.LotNo}' "); - sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfo] SET [Quantity] = Quantity-{mode.CurrentQuantity.ToInt()} Where [LotNo]='{models.LotNo}' "); + //StringBuilder sqlString = new StringBuilder(); - sqlString.Append($@" INSERT INTO ICSWareHouseLotInfoLog SELECT NEWID(), Identification, TransCode, TransSequence, '{mode.CurrentLotNo}', InvCode, FromWarehouseCode, FromLocationCode, ToWarehouseCode, ToLocationCode, CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}), Memo, Lock, '4', BusinessCode, ERPUpload, ERPID, ERPDetailID, ERPCode, ERPSequence, LogID, MergeID, '{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1, EATTRIBUTE2, EATTRIBUTE3 - FROM ICSWareHouseLotInfoLog WHERE LotNo='{models.LotNo}' "); + //if (models.LotNo == null || models.detail == null) + //{ + // msg = "拆分失败，拆分数据不能为空"; + // return msg; + //} + //foreach (var mode in models.detail) + //{ + // sqlString.Append($@" INSERT INTO ICSInventoryLot (ID,LotNo,InvCode,ProductDate,ExpirationDate,Quantity,Amount,ExtensionID,Type,PrintTimes,LastPrintUser, + // LastPrintTime,MUSER,MUSERName,MTIME,WorkPoint,EATTRIBUTE1 ) + // SELECT NEWID(),'{mode.CurrentLotNo}',InvCode,ProductDate,ExpirationDate,CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}),Amount,ExtensionID,Type,PrintTimes, + // LastPrintUser,LastPrintTime,'{user}','{userName}','{models.MTIME}',WorkPoint,'{models.LotNo}' + // FROM ICSInventoryLot + // WHERE LotNo='{models.LotNo}' "); + // sqlString.Append($@" INSERT INTO ICSWareHouseLotInfo + // SELECT + // NEWID(), '{mode.CurrentLotNo}', WarehouseCode, LocationCode, InvCode, CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}), InDate, LockQuantity, '{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1 + // FROM ICSWareHouseLotInfo + // WHERE LotNo='{models.LotNo}' "); + // sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfo] SET [Quantity] = Quantity-{mode.CurrentQuantity.ToInt()} Where [LotNo]='{models.LotNo}' "); - sqlString.Append($@" INSERT INTO ICSInventoryLotDetail SELECT '{mode.CurrentLotNo}', TransCode, TransSequence,'{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1 FROM ICSInventoryLotDetail WHERE LotNo='{models.LotNo}';"); + // sqlString.Append($@" INSERT INTO ICSWareHouseLotInfoLog SELECT NEWID(), Identification, TransCode, TransSequence, '{mode.CurrentLotNo}', InvCode, FromWarehouseCode, FromLocationCode, ToWarehouseCode, ToLocationCode, CONVERT(NUMERIC(10,2),{mode.CurrentQuantity}), Memo, Lock, '4', BusinessCode, ERPUpload, ERPID, ERPDetailID, ERPCode, ERPSequence, LogID, MergeID, '{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1, EATTRIBUTE2, EATTRIBUTE3 + // FROM ICSWareHouseLotInfoLog WHERE LotNo='{models.LotNo}' "); - sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfoLog] SET [Quantity] = Quantity-{mode.CurrentQuantity.ToInt()} Where [LotNo]='{models.LotNo}' "); + // sqlString.Append($@" INSERT INTO ICSInventoryLotDetail SELECT '{mode.CurrentLotNo}', TransCode, TransSequence,'{user}','{userName}', '{models.MTIME}', WorkPoint, EATTRIBUTE1 FROM ICSInventoryLotDetail WHERE LotNo='{models.LotNo}';"); - } - var sql = sqlString.ToString(); - var count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString()); - if (count <= 0) + // sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfoLog] SET [Quantity] = Quantity-{mode.CurrentQuantity.ToInt()} Where [LotNo]='{models.LotNo}' "); + + //} + //var sql = sqlString.ToString(); + //var count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString()); + //if (count <= 0) + //{ + // msg = "操作失败"; + //} + string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTSplit/Create"; + string result = HttpPost(APIURL, Parameter); + JObject Obj = (JObject)JsonConvert.DeserializeObject(result);//或者JObject jo = JObject.Parse(jsonText); + string MessAge = Obj["Message"].ToString(); + string Success = Obj["Success"].ToString(); + if (Success.ToUpper() == "FALSE") { - msg = "操作失败"; + msg = MessAge; } - // string msg = ""; - //string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTSplit/Create"; - //string result = HttpPost(APIURL, Parameter); - //JObject Obj = (JObject)JsonConvert.DeserializeObject(result);//或者JObject jo = JObject.Parse(jsonText); - //string MessAge = Obj["Message"].ToString(); - //string Success = Obj["Success"].ToString(); - //if (Success.ToUpper() == "FALSE") - //{ - // msg = MessAge; - //} - + } catch (Exception ex) { @@ -157,115 +156,112 @@ SELECT ID,LotNo FROM ICSWareHouseLotInfo WITH (NOLOCK) WHERE ID in ({0}) "; //合批 - public string Combine(string LotNo, string ID) - { - string msg = ""; - try - { - string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; - string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; - string sql = @" select distinct LotNo,Quantity from ICSWareHouseLotInfo WHERE ID IN (" + ID.TrimEnd(',') + ")"; - DataTable dt = Repository().FindTableBySql(sql.ToString()); - List asn = new List(); - LotNoCombineHead ass = new LotNoCombineHead(); - for (int i = 0; i < dt.Rows.Count; i++) - { - if (LotNo == dt.Rows[i]["LotNo"].ToString()) - { - continue; - } - LotNoCombineBody DetailList = new LotNoCombineBody(); - DetailList.CurrentLotNo = dt.Rows[i]["LotNo"].ToString(); - DetailList.CurrentQuantity = dt.Rows[i]["Quantity"].ToString(); - ass.detail.Add(DetailList); - } - ass.LotNo = LotNo; - ass.User = MUSER; - ass.WorkPoint = WorkPoint; - ass.MTIME = System.DateTime.Now.ToString("s"); - asn.Add(ass); - StringBuilder sqlString = new StringBuilder(); - decimal quantity = 0; - foreach (var models in asn) - { - if (models.LotNo == null || models.detail == null) - { - throw new Exception("合并失败"); - } - foreach (var mode in models.detail) - { - - sqlString.Append($@"IF NOT EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.WarehouseCode=(SELECT top 1 WarehouseCode FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}') AND a.InvCode=(SELECT top 1 InvCode FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}') AND a.LotNo='{models.LotNo}') - BEGIN - RAISERROR('不同物料、仓库的物料不能合批,',16,1); - END - IF NOT EXISTS(SELECT a.LotNo FROM ICSInventoryLot a WHERE a.ExtensionID=(SELECT top 1 ExtensionID FROM ICSInventoryLot WHERE LotNo='{mode.CurrentLotNo}') AND a.LotNo='{models.LotNo}') - BEGIN - RAISERROR('不同批次的物料不能合批',16,1); - END; "); - sqlString.Append($@" DELETE FROM ICSInventoryLot WHERE LotNo='{mode.CurrentLotNo}'; "); - sqlString.Append($@" DELETE FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}'; "); - - sqlString.Append($@" DELETE FROM ICSWareHouseLotInfoLog WHERE LotNo='{mode.CurrentLotNo}'; "); - - quantity += mode.CurrentQuantity.ToDecimal(); - } - - sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfo] SET [Quantity] = Quantity+{quantity} Where [LotNo]='{models.LotNo}'; "); - sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfoLog] SET [Quantity] = Quantity+{quantity} Where [LotNo]='{models.LotNo}'; "); - } - var count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString()); - if (count <= 0) - throw new Exception("操作失败"); - } - catch (Exception ex) - { - msg = ex.Message; - } - return msg; - } - - ////合批 //public string Combine(string LotNo, string ID) //{ // string msg = ""; - // string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; - // string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; - // string sql = @" select distinct LotNo,Quantity from ICSWareHouseLotInfo WHERE ID IN (" + ID.TrimEnd(',') + ")"; - // DataTable dt = Repository().FindTableBySql(sql.ToString()); - // List asn = new List(); - // LotNoCombineHead ass = new LotNoCombineHead(); - // for (int i = 0; i < dt.Rows.Count; i++) + // try // { - // if (LotNo == dt.Rows[i]["LotNo"].ToString()) + // string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; + // string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; + // string sql = @" select distinct LotNo,Quantity from ICSWareHouseLotInfo WHERE ID IN (" + ID.TrimEnd(',') + ")"; + // DataTable dt = Repository().FindTableBySql(sql.ToString()); + // List asn = new List(); + // LotNoCombineHead ass = new LotNoCombineHead(); + // for (int i = 0; i < dt.Rows.Count; i++) // { - // continue; + // if (LotNo == dt.Rows[i]["LotNo"].ToString()) + // { + // continue; + // } + // LotNoCombineBody DetailList = new LotNoCombineBody(); + // DetailList.CurrentLotNo = dt.Rows[i]["LotNo"].ToString(); + // DetailList.CurrentQuantity = dt.Rows[i]["Quantity"].ToString(); + // ass.detail.Add(DetailList); // } - // LotNoCombineBody DetailList = new LotNoCombineBody(); - // DetailList.CurrentLotNo= dt.Rows[i]["LotNo"].ToString(); - // DetailList.CurrentQuantity= dt.Rows[i]["Quantity"].ToString(); - // ass.detail.Add(DetailList); - // } - // ass.LotNo = LotNo; - // ass.User = MUSER; - // ass.WorkPoint = WorkPoint; - // ass.MTIME= System.DateTime.Now.ToString("s"); - // asn.Add(ass); + // ass.LotNo = LotNo; + // ass.User = MUSER; + // ass.WorkPoint = WorkPoint; + // ass.MTIME = System.DateTime.Now.ToString("s"); + // asn.Add(ass); + // StringBuilder sqlString = new StringBuilder(); + // decimal quantity = 0; + // foreach (var models in asn) + // { + // if (models.LotNo == null || models.detail == null) + // { + // throw new Exception("合并失败"); + // } + // foreach (var mode in models.detail) + // { + + // sqlString.Append($@"IF NOT EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.WarehouseCode=(SELECT top 1 WarehouseCode FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}') AND a.InvCode=(SELECT top 1 InvCode FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}') AND a.LotNo='{models.LotNo}') + // BEGIN + // RAISERROR('不同物料、仓库的物料不能合批,',16,1); + // END + // IF NOT EXISTS(SELECT a.LotNo FROM ICSInventoryLot a WHERE a.ExtensionID=(SELECT top 1 ExtensionID FROM ICSInventoryLot WHERE LotNo='{mode.CurrentLotNo}') AND a.LotNo='{models.LotNo}') + // BEGIN + // RAISERROR('不同批次的物料不能合批',16,1); + // END; "); + // sqlString.Append($@" DELETE FROM ICSInventoryLot WHERE LotNo='{mode.CurrentLotNo}'; "); + // sqlString.Append($@" DELETE FROM ICSWareHouseLotInfo WHERE LotNo='{mode.CurrentLotNo}'; "); + + // sqlString.Append($@" DELETE FROM ICSWareHouseLotInfoLog WHERE LotNo='{mode.CurrentLotNo}'; "); - // string input = JsonConvert.SerializeObject(asn); - // string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTMerge/Create"; - // string result = HttpPost(APIURL, input); - // JObject Obj = (JObject)JsonConvert.DeserializeObject(result);//或者JObject jo = JObject.Parse(jsonText); - // string MessAge = Obj["Message"].ToString(); - // string Success = Obj["Success"].ToString(); - // if (Success.ToUpper() == "FALSE") + // quantity += mode.CurrentQuantity.ToDecimal(); + // } + + // sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfo] SET [Quantity] = Quantity+{quantity} Where [LotNo]='{models.LotNo}'; "); + // sqlString.Append($@" UPDATE [dbo].[ICSWareHouseLotInfoLog] SET [Quantity] = Quantity+{quantity} Where [LotNo]='{models.LotNo}'; "); + // } + // var count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString()); + // if (count <= 0) + // throw new Exception("操作失败"); + // } + // catch (Exception ex) // { - // msg = MessAge; + // msg = ex.Message; // } // return msg; //} + //合批 + public string Combine(string LotNo, string ID) + { + string msg = ""; + string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location; + string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode; + string sql = @" select distinct LotNo,Quantity from ICSWareHouseLotInfo WHERE ID IN (" + ID.TrimEnd(',') + ")"; + DataTable dt = Repository().FindTableBySql(sql.ToString()); + List asn = new List(); + LotNoCombineHead ass = new LotNoCombineHead(); + for (int i = 0; i < dt.Rows.Count; i++) + { + if (LotNo == dt.Rows[i]["LotNo"].ToString()) + { + continue; + } + LotNoCombineBody DetailList = new LotNoCombineBody(); + DetailList.CurrentLotNo = dt.Rows[i]["LotNo"].ToString(); + DetailList.CurrentQuantity = dt.Rows[i]["Quantity"].ToString(); + ass.detail.Add(DetailList); + } + ass.LotNo = LotNo; + ass.User = MUSER; + ass.WorkPoint = WorkPoint; + ass.MTIME = System.DateTime.Now.ToString("s"); + asn.Add(ass); - + string input = JsonConvert.SerializeObject(asn); + string APIURL = ConfigurationManager.ConnectionStrings["APIURL"].ConnectionString + "LOTMerge/Create"; + string result = HttpPost(APIURL, input); + JObject Obj = (JObject)JsonConvert.DeserializeObject(result);//或者JObject jo = JObject.Parse(jsonText); + string MessAge = Obj["Message"].ToString(); + string Success = Obj["Success"].ToString(); + if (Success.ToUpper() == "FALSE") + { + msg = MessAge; + } + return msg; + } } } diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs index 9fec75b..94c6a00 100644 --- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs +++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs @@ -2909,7 +2909,7 @@ CAST( (a.Quantity-ISNULL(c.LOTQTY,0)) as DECIMAL(18,{0})) as thisCreateQty,isnu foreach (string DocNO in DocListSave) { - string sql = @" select A.DNCode,A.Sequence,A.InvCode,A.Quantity,B.LocationCode AS Area from ICSDeliveryNotice A + string sql = @" select A.DNCode,A.Sequence,A.InvCode,ISNULL(A.SAPSequence,A.Quantity) AS Quantity,B.LocationCode AS Area from ICSDeliveryNotice A INNER JOIN ICSInventoryDetail B ON B.WHCode=A.WHCode AND B.INVCode=A.InvCode AND B.WorkPoint=A.WorkPoint where A.DNCode='{0}' and A.WorkPoint='{1}'"; sql = string.Format(sql, DocNO, WorkPoint); diff --git a/WMS-BS/NFine.Web/Configs/database.config b/WMS-BS/NFine.Web/Configs/database.config index 7b5da76..4bd903c 100644 --- a/WMS-BS/NFine.Web/Configs/database.config +++ b/WMS-BS/NFine.Web/Configs/database.config @@ -14,7 +14,7 @@ - +