diff --git a/北京北汽/Common/CK.SCP.Common.csproj b/北京北汽/Common/CK.SCP.Common.csproj
index 689f119..d8c4ee7 100644
--- a/北京北汽/Common/CK.SCP.Common.csproj
+++ b/北京北汽/Common/CK.SCP.Common.csproj
@@ -72,6 +72,7 @@
+
diff --git a/北京北汽/Controller/CK.SCP.Controller.csproj b/北京北汽/Controller/CK.SCP.Controller.csproj
index f164940..a35aef8 100644
--- a/北京北汽/Controller/CK.SCP.Controller.csproj
+++ b/北京北汽/Controller/CK.SCP.Controller.csproj
@@ -46,7 +46,11 @@
+
+
+
+
@@ -70,6 +74,11 @@
+
+ True
+ True
+ Settings.settings
+
@@ -118,6 +127,11 @@
+
+ True
+ True
+ Reference.map
+
@@ -132,7 +146,37 @@
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+ MSDiscoCodeGenerator
+ Reference.cs
+
+
+
+
+
+
+
+
+
+
+ Dynamic
+ Web References\WebReference\
+ http://10.60.101.3:8009/ExchangeCenterService.asmx%3fop=GetSessionId
+
+
+
+
+ Settings
+ CK_SCP_Controller_WebReference_ExchangeCenterService
+
+
+
+
-
\ No newline at end of file
diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
index a86d3cf..4b27543 100644
--- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs
@@ -8,17 +8,16 @@ using CK.SCP.Utils;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data.Entity.Migrations;
using System.Linq;
using System.Text;
using System.Threading;
-using System.Threading.Tasks;
using System.Transactions;
using System.Data.Entity.Core;
-using System.Security.Cryptography;
-using System.Data.Entity;
-using System.Collections.ObjectModel;
+using System.Data;
+using CK.SCP.Controller.WebReference;
+using CK.SCP.Models.UniApiEntity;
+using System.Threading.Tasks;
//using WebSrvAPITest;
namespace CK.SCP.Controller
@@ -194,28 +193,29 @@ namespace CK.SCP.Controller
// return list;
//}
- public static ResultObject> Get_TEA_TASK_SUB_List(TEA_TASK_SUB p_entity)
+ public static List Get_TEA_TASK_SUB_List(TEA_TASK_SUB p_entity)
{
- ResultObject> _ret = new ResultObject>();
- try
- {
+ //ResultObject> _ret = new ResultObject>();
+ //try
+ //{
+ List _ret = new List();
using (var db = EntitiesFactory.CreateExchangeCenterInstance())
{
string _sql = "select * from TEA_TASK_SUB with(nolock) where TaskState = '{0}' and Subscriber = '{1}'";
_sql = string.Format(_sql, (int)p_entity.TaskState, p_entity.Subscriber);
var q = db.Database.SqlQuery(_sql).OrderBy(p=>p.CreateTime).ToList();
- _ret.State = ReturnStatus.Succeed;
- _ret.Result = q;
- }
- }
- catch (Exception e)
- {
- _ret.State = ReturnStatus.Failed;
- _ret.ErrorList.Add(e);
- LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_DC_UNI_CONTROLLER), "Get_TEA_TASK_SUB_List", e.Message);
- throw e;
- }
+ //_ret.State = ReturnStatus.Succeed;
+ _ret = q;
+ }
+ //}
+ //catch (Exception e)
+ //{
+ // _ret.State = ReturnStatus.Failed;
+ // _ret.ErrorList.Add(e);
+ // LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_DC_UNI_CONTROLLER), "Get_TEA_TASK_SUB_List", e.Message);
+ // throw e;
+ //}
return _ret;
}
@@ -360,12 +360,12 @@ namespace CK.SCP.Controller
// ResultObject> result = new ResultObject>();
var _result = Get_TEA_TASK_SUB_List(new TEA_TASK_SUB() { TaskState = EnumTaskState.Unread, Subscriber = "SCP"});
//List tasklist = Get_TEA_TASK_SUB_List(new TEA_TASK_SUB() { TaskState = EnumTaskState.Unread, Subscriber = "SCP" });
- //if (tasklist.Count() > 0)
- if (_result.State == ReturnStatus.Succeed)
+ if (_result.Count() > 0)
+ //if (_result.State == ReturnStatus.Succeed)
{
- //foreach (var _task in tasklist)
- foreach (var _task in _result.Result)
+ foreach (var _task in _result)
+ //foreach (var _task in _result.Result)
{
ScpEntities scpdb = EntitiesFactory.CreateScpInstance();
DataCenterContext dc = EntitiesFactory.CreateDataCenterInstance();
@@ -418,32 +418,34 @@ namespace CK.SCP.Controller
EntitiesFactory.SaveDb(dc);
scope.Complete();
break;
- case "TES_SUPPLIER":
- var _supplierlist = db.TES_SUPPLIER.Where(p => p.TaskID == _task.TaskID).ToList();
- result = UpdateSupplier(_supplierlist, scpdb, authdb, _task);
- result.Message = _task.TaskID.ToString();
- Update_TEA_TASK_SUB(db, _task);
- scpdb.BulkSaveChanges();
- db.BulkSaveChanges();
- authdb.BulkSaveChanges();
- dc.BulkSaveChanges();
- //EntitiesFactory.SaveDb(scpdb);
- //EntitiesFactory.SaveDb(db);
- //EntitiesFactory.SaveDb(dc);
- //EntitiesFactory.SaveDb(authdb);
- //取消自动创建
- //UpdateSupplierExtend(_supplierlist);
- scope.Complete();
- break;
- case "TES_PART_MSTR":
- result = UpdatePart(db, scpdb, _task);
- result.Message = _task.TaskID.ToString();
- Update_TEA_TASK_SUB(db, _task);
- EntitiesFactory.SaveDb(scpdb);
- EntitiesFactory.SaveDb(db);
- EntitiesFactory.SaveDb(dc);
- scope.Complete();
- break;
+ #region 单独读取 供应商和零件
+ //case "TES_SUPPLIER":
+ // var _supplierlist = db.TES_SUPPLIER.Where(p => p.TaskID == _task.TaskID).ToList();
+ // result = UpdateSupplier(_supplierlist, scpdb, authdb, _task);
+ // result.Message = _task.TaskID.ToString();
+ // Update_TEA_TASK_SUB(db, _task);
+ // scpdb.BulkSaveChanges();
+ // db.BulkSaveChanges();
+ // //authdb.BulkSaveChanges();
+ // dc.BulkSaveChanges();
+ // //EntitiesFactory.SaveDb(scpdb);
+ // //EntitiesFactory.SaveDb(db);
+ // //EntitiesFactory.SaveDb(dc);
+ // //EntitiesFactory.SaveDb(authdb);
+ // //取消自动创建
+ // //UpdateSupplierExtend(_supplierlist);
+ // scope.Complete();
+ // break;
+ //case "TES_PART_MSTR":
+ // result = UpdatePart(db, scpdb, _task);
+ // result.Message = _task.TaskID.ToString();
+ // Update_TEA_TASK_SUB(db, _task);
+ // EntitiesFactory.SaveDb(scpdb);
+ // EntitiesFactory.SaveDb(db);
+ // EntitiesFactory.SaveDb(dc);
+ // scope.Complete();
+ // break;
+ #endregion
case "TED_PPOD_DET":
result = UpdatePPod(db, scpdb, _task);
result.Message = _task.TaskID.ToString();
@@ -513,6 +515,103 @@ namespace CK.SCP.Controller
p_action(result);
}
+ ///
+ /// 基础数据
+ ///
+ ///
+ public static void BaseReadService(Action> p_action)
+ {
+ ResultObject result = new ResultObject();
+ ExchangeCenterService service = new ExchangeCenterService();
+ var jsonResult = service.GetSessionId("SCP", "5C2DE907DB859810", "");
+ var serviceResultEntityList = JsonConvert.DeserializeObject< List>(jsonResult);
+ string SessionId = "";
+ SessionId = serviceResultEntityList.First().Data;
+ var _result = Get_TEA_TASK_SUB_List(new TEA_TASK_SUB() { TaskState = EnumTaskState.Unread, Subscriber = "SCP" });
+ if (_result.Count() > 0)
+ {
+
+ foreach (var _task in _result)
+ //foreach (var _task in _result.Result)
+ {
+ ScpEntities scpdb = EntitiesFactory.CreateScpInstance();
+ DataCenterContext dc = EntitiesFactory.CreateDataCenterInstance();
+ AppBoxContext authdb = EntitiesFactory.CreateAppBoxInstance();
+ ExchangeCenterContext db = EntitiesFactory.CreateExchangeCenterInstance();
+
+ using (var scope =
+ new TransactionScope(TransactionScopeOption.Suppress, new TransactionOptions()
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.RepeatableRead,
+ Timeout = new TimeSpan(0, 20, 0)
+ }))
+ {
+ try
+ {
+ switch (_task.TableName)
+ {
+ case "TES_SUPPLIER":
+ var _supplierlist = db.TES_SUPPLIER.Where(p => p.TaskID == _task.TaskID).ToList();
+ result = UpdateSupplier(_supplierlist, scpdb, authdb, _task);
+ result.Message = _task.TaskID.ToString();
+ service.UpdateTaskState(SessionId, _task.TaskID.ToString(), 2,0,"");
+ //Update_TEA_TASK_SUB(db, _task);
+ scpdb.BulkSaveChanges();
+ scope.Complete();
+ break;
+ case "TES_PART_MSTR":
+ result = UpdatePart(db, scpdb, _task);
+ result.Message = _task.TaskID.ToString();
+ service.UpdateTaskState(SessionId, _task.TaskID.ToString(), 2, 0, "");
+ //Update_TEA_TASK_SUB(db, _task);
+ EntitiesFactory.SaveDb(scpdb);
+ scope.Complete();
+ break;
+
+ }
+ result.State = ReturnStatus.Succeed;
+ result.Result = true;
+ }
+ catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常
+ {
+ var sb = new StringBuilder();
+ foreach (var error in dbEx.EntityValidationErrors.ToList())
+ {
+ error.ValidationErrors.ToList().ForEach(i =>
+ {
+ sb.AppendFormat("表:{0},字段:{1},信息:{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage);
+ });
+ }
+ scope.Dispose();
+ result.State = ReturnStatus.Failed;
+ result.ErrorList.Add(dbEx);
+ }
+ catch (OptimisticConcurrencyException ex)//并发冲突异常
+ {
+
+ scope.Dispose();
+ result.State = ReturnStatus.Failed;
+ result.ErrorList.Add(ex);
+ }
+ catch (Exception ex)
+ {
+ scope.Dispose();
+ result.State = ReturnStatus.Failed;
+ result.ErrorList.Add(ex);
+ result.Message = ex.Message; //_task.TaskID.ToString();
+ if (ex.InnerException != null)
+ {
+ result.Message = ex.InnerException.Message;
+ }
+ }
+ }
+ p_action(result);
+ }
+ }
+ p_action(result);
+ }
+
+
public static void WriteService(Action>> p_action)
{
ResultObject> result = new ResultObject>();
@@ -528,8 +627,8 @@ namespace CK.SCP.Controller
{
ScpEntities scpdb = EntitiesFactory.CreateScpInstance();
ExchangeCenterContext db = EntitiesFactory.CreateExchangeCenterInstance();
- var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT").OrderBy(p => p.UID).ToList();
- var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "BJBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList();
+ var _list = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CDBMPT").OrderBy(p => p.UID).ToList();
+ var _list1 = scpdb.TS_UNI_API.Where(p => p.State == (int)DataState.Enabled && p.Domain == "CDBMPT" && p.InterfaceType == "Price").OrderBy(p => p.UID).ToList();
var apiii = _list1.Count();
if (apiii > 0)
@@ -2053,12 +2152,14 @@ namespace CK.SCP.Controller
ResultObject _ret = new ResultObject();
try
{
- var _venderlist = new List();
+ var _tavenderlist = scpdb.TA_VENDER.ToList();
+ var addlist = new List();
+ var uplist = new List();
foreach (var supplier in p_list)
{
foreach (var item in _dic)
{
- var _supplier = scpdb.TA_VENDER.FirstOrDefault(p => p.VendId == supplier.SupplierCode && p.Site == item.Key);
+ var _supplier = _tavenderlist.FirstOrDefault(p => p.VendId == supplier.SupplierCode && p.Site == item.Key);
if (_supplier == null)
{
_supplier = new TA_VENDER
@@ -2067,15 +2168,25 @@ namespace CK.SCP.Controller
VendAbbCode = "0",
State = 1,
};
- }
- _supplier.VendName = string.IsNullOrEmpty(supplier.SupplierName) ? supplier.SupplierName : supplier.SupplierName;
+ _supplier.VendName = string.IsNullOrEmpty(supplier.SupplierName) ? supplier.SupplierName : supplier.SupplierName;
- _supplier.SubSite = item.Value;//地点
- _supplier.Site = item.Key;//域
- _supplier.Remark = supplier.TaskID.ToString();//任务ID
+ _supplier.SubSite = item.Value;//地点
+ _supplier.Site = item.Key;//域
+ _supplier.Remark = supplier.TaskID.ToString();//任务ID
+ addlist.Add(_supplier);
+ }
+ else
+ {
+ _supplier.VendName = string.IsNullOrEmpty(supplier.SupplierName) ? supplier.SupplierName : supplier.SupplierName;
- var vendname = string.Format("{0}@{1}", _supplier.VendId.ToUpper(), _supplier.Site.ToUpper());
- // 取消自动创建
+ _supplier.SubSite = item.Value;//地点
+ _supplier.Site = item.Key;//域
+ _supplier.Remark = supplier.TaskID.ToString();//任务ID
+ uplist.Add(_supplier);
+ }
+# region 取消自动创建
+ //var vendname = string.Format("{0}@{1}", _supplier.VendId.ToUpper(), _supplier.Site.ToUpper());
+ //
//var _first = authdb.Users.Where(p => p.Name == vendname).FirstOrDefault();
//var _vend = authdb.Roles.Where(p => p.Name == "供应商").FirstOrDefault();
//var _factory = authdb.TA_FACTORY.Where(p => p.ErpDomain == _supplier.Site.ToUpper()).FirstOrDefault();
@@ -2108,10 +2219,13 @@ namespace CK.SCP.Controller
// _entity.TA_FACTORY.Add(f);
// authdb.Users.Add(_entity);
//}
- _venderlist.Add(_supplier);
+ //_venderlist.Add(_supplier);
+#endregion
}
}
- scpdb.TA_VENDER.AddOrUpdate(q => q.UID, _venderlist.ToArray());
+ scpdb.BulkInsert(addlist);
+ scpdb.BulkUpdate(uplist);
+ //scpdb.TA_VENDER.AddOrUpdate(q => q.UID, _venderlist.ToArray());
_ret.State = ReturnStatus.Succeed;
_ret.MessageList.Add(string.Format("更新表{0}任务ID{1}成功!", "TES_SUPPLIER", p_entity.TaskID));
}
diff --git a/北京北汽/Controller/SCP_LOGINNUMBER_CONTROLLER.cs b/北京北汽/Controller/SCP_LOGINNUMBER_CONTROLLER.cs
index 70bac74..5533d55 100644
--- a/北京北汽/Controller/SCP_LOGINNUMBER_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_LOGINNUMBER_CONTROLLER.cs
@@ -52,10 +52,10 @@ namespace CK.SCP.Controller
{
login.Number = 5;
db.TA_LOGINNUMBER.AddOrUpdate(login);
-
- user.Enabled = false;
- _appdb.Users.AddOrUpdate(user);
- _appdb.SaveChanges();
+
+ user.Enabled = false;
+ _appdb.Users.AddOrUpdate(user);
+ _appdb.SaveChanges();
_ret.MessageList.Add("因您连续五次输入密码错误,该账号已经被设为未启用状态,请联系系统管理员");
}
diff --git a/北京北汽/Controller/SCP_MoldSharing_Controller.cs b/北京北汽/Controller/SCP_MoldSharing_Controller.cs
index 6f8a288..9f70e97 100644
--- a/北京北汽/Controller/SCP_MoldSharing_Controller.cs
+++ b/北京北汽/Controller/SCP_MoldSharing_Controller.cs
@@ -36,6 +36,10 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.VendId == p_entity.VendId);
}
+ if (!string.IsNullOrEmpty(p_entity.Site))
+ {
+ q = q.Where(p => p.Site == p_entity.Site);
+ }
q = q.Where(p => p.IsDeleted == p_entity.IsDeleted);
_ret.State = ReturnStatus.Succeed;
_ret.Result = q;
diff --git a/北京北汽/Controller/SCP_PLAN_CONTROLLER.cs b/北京北汽/Controller/SCP_PLAN_CONTROLLER.cs
index ce4a2b0..4b412d0 100644
--- a/北京北汽/Controller/SCP_PLAN_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_PLAN_CONTROLLER.cs
@@ -1919,6 +1919,396 @@ namespace CK.SCP.Controller
// return _ret;
//}
+ public static ResultObject PLAN_TO_ASK1(List p_order_list, User p_user)
+ {
+ ResultObject _ret = new ResultObject();
+ try
+ {
+ using (ScpEntities db = EntitiesFactory.CreateScpInstance())
+ {
+ List lineError = new List();
+ List ErrorList = new List();
+ var _lst = p_order_list.Where(p => p.PlanQty != 0).ToList();
+
+ if (lineError.Count > 0)
+ {
+ _ret.State = ReturnStatus.Failed;
+ _ret.MessageList.AddRange(ErrorList);
+ _ret.Result = false;
+ }
+ else
+ {
+ var VenderList = _lst.Select(p => p.VendId).Distinct();
+ var PartCodeList = _lst.Select(p => p.PartCode).Distinct();
+ var OrderList = _lst.GroupBy(p => p.PoBillNum).ToList();
+ OrderList.ForEach((p) =>
+ {
+ var list = p.ToList();
+ if (list.Count > 0)
+ {
+ var _entity = list.FirstOrDefault();
+ TB_ASK _ask = new TB_ASK();
+ _ask.AskBillNum = SCP_BILLCODE_CONTROLLER.MakeASKCode();
+ _ask.VendId = _entity.VendId;
+ _ask.State = (int)AskState.New;
+ _ask.PoBillNum = _entity.PoBillNum;
+ _ask.ModType = (int)BillModType.Contract;
+ _ask.Site = _entity.Site;
+ _ask.Remark = _entity.Version;
+ _ask.State = (int)AskState.New;
+ DateTime date = DateTime.Now;
+ string str = date.Year.ToString();
+ string str1 = date.Month.ToString();
+ string datetime = str + "-" + str1;
+ _ask.UpdateTime = DateTime.Parse(datetime);
+ _ask.Buyer = p_user.ChineseName;
+ _ask.BuyerPhone = p_user.CellPhone;
+ _ask.ErpBillNum = _entity.PoBillNum;
+ _ask.BeginTime = DateTime.Parse( _entity.BeginTime.ToString());
+ _ask.EndTime = _entity.EndTime;
+ _ask.CreateTime = DateTime.Now.Date;
+ _ask.CreateUser = p_user.Name;
+ _ask.VendId = _entity.VendId;
+ _ask.GUID = Guid.NewGuid();
+ _ask.ReceivedPort = string.Empty;
+ _ask.IsDeleted = false;
+ _ask.SubSite = p_user.UserdSite;
+ db.TB_ASK.Add(_ask);
+ #region 供应商新任务代办接口
+ TB_PENING_ITEMS _item = new TB_PENING_ITEMS();
+ _item.ROLE_NAME = "供应商";
+ _item.ITEM_NO = _ask.AskBillNum;
+ _item.ITEM_CONTENT = "要货看盘有信息";
+ _item.ITEM_TYPE = (int)PENDING_MESSAGE_TYPE.NEW_ASK;
+ _item.VEND_ID = _ask.VendId;
+ _item.ITEM_STATE = (int)PENDING_STATE.WAITING;
+ _item.SENDER = p_user.ChineseName;
+ _item.SENDING_TIME = DateTime.Now;
+ db.TB_PENING_ITEMS.Add(_item);
+ #endregion
+ // int _number = 1;
+ List _ls = new List();
+ list.ForEach((itm) =>
+ {
+ var _number = _ls.Count(p1 => p1.PoBillNum == _ask.PoBillNum
+ && p1.PoLine == itm.PoLine && p1.PartCode == itm.PartCode);
+ if (_number > 0)
+ {
+ _ret.MessageList.Add(string.Format("已经存在订单为{0}行号为{1}零件编码为{2}", itm.PoBillNum, itm.PoLine.ToString(), itm.PartCode));
+ }
+ TB_ASK_DETAIL _t_ASK_Detail = new TB_ASK_DETAIL();
+ //_t_ASK_Detail.PoLine = _number;
+ _t_ASK_Detail.PoLine = itm.PoLine;
+ _t_ASK_Detail.Currency = "CNY";
+ _t_ASK_Detail.AskBillNum = _ask.AskBillNum;
+ _t_ASK_Detail.PoBillNum = _ask.PoBillNum;
+ _t_ASK_Detail.PoUnit = itm.PoUnit;
+ _t_ASK_Detail.CreateTime = DateTime.Now;
+ _t_ASK_Detail.CreateUser = _ask.CreateUser;
+ _t_ASK_Detail.PartCode = itm.PartCode;
+ _t_ASK_Detail.BeginTime = _ask.BeginTime;
+ _t_ASK_Detail.EndTime = itm.EndTime;
+ _t_ASK_Detail.TempQty = itm.PlanQty;
+ _t_ASK_Detail.AskQty = itm.PlanQty;
+ _t_ASK_Detail.IsDeleted = false;
+ _t_ASK_Detail.LocUnit = itm.PoUnit;
+ _t_ASK_Detail.UnConv = 1;
+ _t_ASK_Detail.Remark = itm.Version;
+ _t_ASK_Detail.State = _ask.State;
+ _t_ASK_Detail.SubSite = p_user.UserdSite;
+ // _t_ASK_Detail.Price = string.IsNullOrEmpty(itm.) ? 0 : decimal.Parse(itm.价格);
+ _t_ASK_Detail.GUID = Guid.NewGuid();
+ _t_ASK_Detail.Remark = _ask.Site;
+ db.TB_ASK_DETAIL.Add(_t_ASK_Detail);
+ _ls.Add(_t_ASK_Detail);
+ // _number++;
+ });
+
+ }
+ else
+ {
+ _ret.MessageList.Add("ERP订单编号已存在,请重新导入!");
+
+ }
+ if (_ret.MessageList.Count == 0)
+ {
+ int state = db.SaveChanges();
+ if (state != -1)
+ {
+ _ret.State = ReturnStatus.Succeed;
+ _ret.Result = true;
+ }
+ else
+ {
+ _ret.State = ReturnStatus.Failed;
+ _ret.Result = false;
+ }
+ }
+ else
+ {
+ _ret.State = ReturnStatus.Failed;
+ _ret.Result = false;
+ }
+ }
+ );
+ }
+ }
+ }
+ catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常
+ {
+ var sb = new StringBuilder();
+ foreach (var error in dbEx.EntityValidationErrors.ToList())
+ {
+ error.ValidationErrors.ToList().ForEach(i =>
+ {
+ sb.AppendFormat("表:{0},字段:{1},信息:{2}\r\n", error.Entry.Entity.GetType().Name, i.PropertyName, i.ErrorMessage);
+ });
+ }
+ _ret.State = ReturnStatus.Failed;
+ _ret.Result = false;
+ _ret.ErrorList.Add(dbEx);
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_PO_CONTROLLER), "EXCEL_PO_TO_ASK", sb.ToString());
+ throw new ScpException(ResultCode.DbEntityValidationException, sb.ToString(), "字段验证失败" + sb.ToString());
+ }
+ catch (OptimisticConcurrencyException ex)//并发冲突异常
+ {
+
+ _ret.State = ReturnStatus.Failed;
+ _ret.Result = false;
+ _ret.ErrorList.Add(ex);
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_PO_CONTROLLER), "EXCEL_PO_TO_ASK", ex.ToString());
+ throw new ScpException(ResultCode.Exception, "9999", ex.ToString());
+ }
+ catch (ScpException ex)
+ {
+ _ret.State = ReturnStatus.Failed;
+ _ret.Result = false;
+ _ret.ErrorList.Add(ex);
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_PO_CONTROLLER), "EXCEL_PO_TO_ASK", ex.ToString());
+
+ if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException))
+ {
+ var inner = (UpdateException)ex.InnerException;
+
+
+ throw new ScpException(ResultCode.Exception, "0000", ex.ToString());
+ }
+ else
+ {
+ if (ex.InnerException != null) throw ex.InnerException;
+ }
+ }
+ catch (Exception e)
+ {
+ _ret.State = ReturnStatus.Failed;
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_PO_CONTROLLER), "EXCEL_PO_TO_ASK", e.Message);
+ _ret.Result = false;
+ _ret.ErrorList.Add(e);
+ throw e;
+ }
+ return _ret;
+
+ }
+ public static DataTable Get_TB_PLAN_REPORT(V_TB_PO_PLAN p_plan)
+ {
+ DataTable dt = new DataTable();
+ DataTable dt1 = new DataTable();
+ DataTable dt2 = new DataTable();
+ DataTable dt3 = new DataTable();
+ string _sqlString = "SELECT * FROM ( SELECT partcode,endtime,planqty,partdesc,pounit,domain,pobillnum,poline FROM V_TB_PO_PLAN where {0}\n " +
+ ") A\n" +
+ " pivot ( sum(planQty) for a.endtime in (\n" +
+ " {1}\n" +
+ ")\n" +
+ ") as ourpivot ";
+
+ string _sql = "SELECT DISTINCT(ENDTIME) FROM V_TB_PO_PLAN where {0} ORDER BY ENDTIME";
+
+ string _askBillSql = "SELECT * FROM V_TB_ASK_DETAIL where VENDID = '{0}' AND EndTime IN ({1}) AND AskBillNum like 'E%' ";
+
+ string _asn_recive = "SELECT A.PartCode, A.PoBillNum, A.PoLine, SUM(A.Qty) AS AsnQty, SUM(ISNULL(B.Qty, 0)) AS ReciveQty,\n" +
+ " SUM(ISNULL(C.AskQty, 0)) AS AskQty\n" +
+ "FROM V_TB_ASN_DETAIL AS A LEFT OUTER JOIN\n" +
+ " V_TB_RECEIVE_DETAIL AS B ON A.AsnBillNum = B.AsnBillNum AND A.PartCode = B.PartCode AND\n" +
+ " A.PoBillNum = B.PoBillNum AND A.PoLine = B.PoLine INNER JOIN\n" +
+ " TB_ASK_DETAIL AS C ON A.AskBillNum = C.AskBillNum AND A.PartCode = C.PartCode AND\n" +
+ " A.PoBillNum = C.PoBillNum AND A.PoLine = C.PoLine\n" +
+ "WHERE (A.AskBillNum LIKE 'E%') AND (A.State > 0) and {0}\n" +
+ "GROUP BY A.PartCode, A.PoBillNum, A.PoLine";
+ var dbSetting = GlobalConfig.ScpDatabase;
+ try
+ {
+ var strConn = EntitiesFactory.GetEfConnectionString(dbSetting);
+ SqlConnection conn = new System.Data.SqlClient.SqlConnection();
+ conn.ConnectionString = strConn;
+ if (conn.State != ConnectionState.Open)
+ {
+ conn.Open();
+ }
+ #region 结束时间范围
+ SqlCommand cmd = new SqlCommand();
+ cmd.Connection = conn;
+ string where1 = " 1=1 ";
+ if (!string.IsNullOrEmpty(p_plan.PartCode))
+ {
+ where1 += string.Format(" and partcode='{0}' ", p_plan.PartCode);
+ }
+ if (!string.IsNullOrEmpty(p_plan.VendId))
+ {
+ where1 += string.Format(" and VendId='{0}' ", p_plan.VendId);
+ }
+ if (!string.IsNullOrEmpty(p_plan.PoBillNum))
+ {
+ where1 += string.Format(" and PoBillNum='{0}' ", p_plan.PoBillNum);
+ }
+ if (p_plan.EndTime_Begin != null)
+ {
+ where1 += string.Format(" and EndTime>='{0}'", p_plan.EndTime_Begin.Value.ToString("yyyy-MM-dd"));
+ }
+ else
+ {
+ where1 += string.Format(" and EndTime>='{0}'", DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ if (p_plan.EndTime_End != null)
+ {
+ where1 += string.Format(" and EndTime<='{0}'", p_plan.EndTime_End.Value.ToString("yyyy-MM-dd"));
+ }
+ else
+ {
+ where1 += string.Format(" and EndTime<='{0}'", DateTime.Now.AddMonths(1).ToString("yyyy-MM-dd"));
+ }
+ cmd.CommandText = string.Format(_sql, where1);
+ SqlDataAdapter adapter = new SqlDataAdapter(cmd);
+ adapter.Fill(dt);
+
+ #endregion
+ List _ls = new List();
+ List _ls1 = new List();
+ foreach (DataRow row in dt.Rows)
+ {
+ _ls.Add(string.Format("[{0}]", row["EndTime"].ToString()));
+ _ls1.Add(string.Format("'{0}'", row["EndTime"].ToString()));
+ }
+ if (_ls.Count > 0)
+ {
+ #region 计划行转列
+ SqlCommand cmd1 = new SqlCommand();
+ cmd1.Connection = conn;
+ string where = "1=1 ";
+ if (!string.IsNullOrEmpty(p_plan.PartCode))
+ {
+ where += string.Format(" and partcode='{0}' ", p_plan.PartCode);
+ }
+ where += string.Format(" and VendId='{0}' ", p_plan.VendId);
+ if (!string.IsNullOrEmpty(p_plan.PoBillNum))
+ {
+ where += string.Format(" and PoBillNum='{0}' ", p_plan.PoBillNum);
+ }
+ cmd1.CommandText = string.Format(_sqlString, where, string.Join(",", _ls.ToArray()));
+ var adapter1 = new SqlDataAdapter(cmd1);
+ adapter1.Fill(dt1);
+ #endregion
+
+ #region 此范围内的看板号
+ SqlCommand cmd2 = new SqlCommand();
+ cmd2.Connection = conn;
+ cmd2.CommandText = string.Format(_askBillSql, p_plan.VendId, string.Join(",", _ls1.ToArray()));
+ SqlDataAdapter adapter2 = new SqlDataAdapter(cmd2);
+ adapter2.Fill(dt2);
+ #endregion
+
+ List _askList = new List();
+ foreach (DataRow row in dt2.Rows)
+ {
+ _askList.Add(string.Format("'{0}'", row["AskBillNum"].ToString()));
+ }
+ if (_askList.Count > 0)
+ {
+ SqlCommand cmd3 = new SqlCommand();
+ cmd3.Connection = conn;
+ cmd3.CommandText = string.Format(_asn_recive, string.Format(" A.askBillNum in ({0}) ", string.Join(",", _askList.ToArray())));
+ SqlDataAdapter adapter3 = new SqlDataAdapter(cmd3);
+ adapter3.Fill(dt3);
+ }
+ var column0 = dt1.Columns.Add("要货数量");
+ var column1 = dt1.Columns.Add("收货数量");
+ var column2 = dt1.Columns.Add("发货数量");
+ var column3 = dt1.Columns.Add("未发数量");
+ var column4 = dt1.Columns.Add("未收数量");
+ foreach (DataRow dr in dt1.Rows)
+ {
+ foreach (DataRow row in dt3.Rows)
+ {
+ if (
+ dr["PartCode"].ToString() == row["PartCode"].ToString()
+ && dr["PoBillNum"].ToString() == row["PoBillNum"].ToString()
+ && dr["PoLine"].ToString() == row["PoLine"].ToString())
+ {
+ dr["要货数量"] = row["ReciveQty"].ToString();
+ dr["收货数量"] = row["ReciveQty"].ToString();
+ dr["发货数量"] = row["AsnQty"].ToString();
+ dr["未收数量"] = decimal.Parse(row["AsnQty"].ToString()) - decimal.Parse(row["ReciveQty"].ToString());
+ dr["未发数量"] = decimal.Parse(row["AskQty"].ToString()) - decimal.Parse(row["AsnQty"].ToString());
+ }
+ }
+ }
+ foreach (DataColumn column in dt1.Columns)
+ {
+ try
+ {
+ var _dt1 = DateTime.Parse(column.ColumnName);
+ var _curDate = _dt1.ToString("yyyy-MM-dd");
+ column.ColumnName = _curDate + "(预测)";//要货预测头
+
+ foreach (DataRow row in dt2.Rows)
+ {
+ var _cur = DateTime.Parse(row["EndTime"].ToString()).ToString("yyyy-MM-dd");//看板时间
+ StringBuilder _buf = new StringBuilder();
+ if (_curDate == _cur)
+ {
+ var _ask = row["AskBillNum"].ToString();
+ column.ColumnName = _cur + "(" + _ask + ")";
+ switch (int.Parse(row["state"].ToString()))
+ {
+ case (int)AskState.New:
+ column.ColumnName = _cur + "(" + _ask + ")" + "(计划)";
+ break;
+ case (int)AskState.Ship:
+ column.ColumnName = _cur + "(" + _ask + ")" + "(已发货)";
+ break;
+ case (int)AskState.Confirm:
+ column.ColumnName = _cur + "(" + _ask + ")" + "(已确认)";
+ break;
+ case (int)AskState.Release:
+ column.ColumnName = _cur + "(" + _ask + ")" + "(已发布)";
+ break;
+ case (int)AskState.Receive:
+ column.ColumnName = _cur + "(" + _ask + ")" + "(已收货)";
+ break;
+ }
+ }
+ }
+ }
+ catch
+ {
+ continue;
+ }
+ }
+ dt1.Columns["PartCode"].ColumnName = "零件编码";
+ dt1.Columns["PartDesc"].ColumnName = "零件描述";
+ dt1.Columns["PoUnit"].ColumnName = "单位";
+ dt1.Columns["PoBillNum"].ColumnName = "订单编号";
+ dt1.Columns["PoLine"].ColumnName = "行号";
+ dt1.Columns["Domain"].ColumnName = "域";
+ }
+ conn.Close();
+ }
+ catch (SqlException ex)
+ {
+ throw new Exception($"系统无法连接到数据库:{dbSetting},请检查配置的服务器,数据库,用户名和密码等信息是否正确。{Environment.NewLine}{ex}");
+ }
+ return dt1;
+ }
}
}
diff --git a/北京北汽/Controller/SCP_PO_CONTROLLER.cs b/北京北汽/Controller/SCP_PO_CONTROLLER.cs
index 7d4e42b..5762657 100644
--- a/北京北汽/Controller/SCP_PO_CONTROLLER.cs
+++ b/北京北汽/Controller/SCP_PO_CONTROLLER.cs
@@ -4124,6 +4124,7 @@ namespace CK.SCP.Controller
_PO_Detail.Dliverypatterncode = itm.发货样式;
_PO_Detail.Deliverytimecode = itm.发货时间样式;
_PO_Detail.Transportdays = string.IsNullOrEmpty(itm.运输周期) ? 0 : int.Parse(itm.运输周期);
+ _PO_Detail.Remark = itm.备注;
db.TB_PO_DETAIL.AddOrUpdate(_PO_Detail);
});
_polist = _polist + _po.PoBillNum + ",";
@@ -5568,5 +5569,92 @@ namespace CK.SCP.Controller
return errorlist;
}
+
+ public static void Get_V_TB_PO_PLAN_List_BJKFT(V_TB_PO_PLAN_BJBMPT p_entity, Action>> p_action)
+ {
+ ResultObject> _ret = new ResultObject>();
+ try
+ {
+ using (ScpEntities db = EntitiesFactory.CreateScpInstance())
+ {
+ IQueryable q = db.V_TB_PO_PLAN_BJBMPT;
+ if (!string.IsNullOrEmpty(p_entity.Domain))
+ {
+ q = q.Where(p => p.Domain.Contains(p_entity.Domain));
+ }
+ if (!string.IsNullOrEmpty(p_entity.PartCode))
+ {
+ q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
+ }
+ if (!string.IsNullOrEmpty(p_entity.PoBillNum))
+ {
+ q = q.Where(p => p.PoBillNum.Contains(p_entity.PoBillNum));
+ }
+ if (!string.IsNullOrEmpty(p_entity.Site))
+ {
+ q = q.Where(p => p.Site.Contains(p_entity.Site));
+ }
+ if (!string.IsNullOrEmpty(p_entity.Buyer))
+ {
+ q = q.Where(p => p.Buyer.Contains(p_entity.Buyer));
+ }
+ if (!string.IsNullOrEmpty(p_entity.ProjectId))
+ {
+ q = q.Where(p => p.ProjectId.Contains(p_entity.ProjectId));
+ }
+ if (!string.IsNullOrEmpty(p_entity.AskBillNum))
+ {
+ q = q.Where(p => p.AskBillNum.Contains(p_entity.AskBillNum));
+ }
+ if (!string.IsNullOrEmpty(p_entity.Version))
+ {
+ q = q.Where(p => p.Version.Contains(p_entity.Version));
+ }
+ if (!string.IsNullOrEmpty(p_entity.PartDesc))
+ {
+ q = q.Where(p => p.PartDesc.Contains(p_entity.PartDesc));
+ }
+ if (!string.IsNullOrEmpty(p_entity.VendId))
+ {
+ q = q.Where(p => p.VendId.Contains(p_entity.VendId));
+ }
+
+ if (p_entity.UserInAddress != null && p_entity.UserInAddress.Count > 0)
+ {
+ q = q.Where(p => p_entity.UserInAddress.Contains(p.Domain));
+ }
+ if (p_entity.UserInVendIds != null && p_entity.UserInVendIds.Count > 0)
+ {
+ q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
+ }
+ if (p_entity.EndTime_Begin != null)
+ {
+ q = q.Where(p => p.EndTime >= p_entity.EndTime_Begin.Value);
+ }
+ if (p_entity.EndTime_End != null)
+ {
+ q = q.Where(p => p.EndTime <= p_entity.EndTime_End.Value);
+ }
+ if (p_entity.EndTime_Begin1 != null)
+ {
+ q = q.Where(p => p.CreateTime >= p_entity.EndTime_Begin1.Value);
+ }
+ if (p_entity.EndTime_End1 != null)
+ {
+ q = q.Where(p => p.CreateTime <= p_entity.EndTime_End1.Value);
+ }
+ _ret.State = ReturnStatus.Succeed;
+ _ret.Result = q;
+ p_action(_ret);
+ }
+ }
+ catch (Exception e)
+ {
+ _ret.State = ReturnStatus.Failed;
+ _ret.ErrorList.Add(e);
+ LogHelper.Writlog(LogHelper.LogType.Error, typeof(V_TB_PO_PLAN), "Get_V_TB_PO_PLAN_List", e.Message);
+ throw e;
+ }
+ }
}
}
diff --git a/北京北汽/Controller/app.config b/北京北汽/Controller/app.config
index 72f696a..600f048 100644
--- a/北京北汽/Controller/app.config
+++ b/北京北汽/Controller/app.config
@@ -2,6 +2,7 @@
+
@@ -30,10 +31,20 @@
+
+
+ http://10.60.101.3:8009/ExchangeCenterService.asmx
+
+
http://10.10.10.21/u9/Services/YY.U9.Cust.MPT.MPTSV.ICommonAPISV.svc
+
+
+
+
\ No newline at end of file
diff --git a/北京北汽/Models/CK.SCP.Models.csproj b/北京北汽/Models/CK.SCP.Models.csproj
index 38f8b36..f71f40d 100644
--- a/北京北汽/Models/CK.SCP.Models.csproj
+++ b/北京北汽/Models/CK.SCP.Models.csproj
@@ -47,6 +47,7 @@
+
@@ -447,6 +448,9 @@
+
+
+
@@ -484,6 +488,7 @@
+
diff --git a/北京北汽/Models/ScpEntities.cs b/北京北汽/Models/ScpEntities.cs
index e7bfdc3..d18efb9 100644
--- a/北京北汽/Models/ScpEntities.cs
+++ b/北京北汽/Models/ScpEntities.cs
@@ -166,6 +166,7 @@ namespace CK.SCP.Models
public virtual DbSet V_TB_ASK_DETAIL_PO { get; set; }
public virtual DbSet TB_ADDRESS_BUYER { get; set; }
+ public virtual DbSet V_TB_PO_PLAN_BJBMPT { get; set; }
protected override void OnModelCreating(DbModelBuilder modelBuilder)
{
diff --git a/北京北汽/Models/ScpEntity/TB_ASN.cs b/北京北汽/Models/ScpEntity/TB_ASN.cs
index 3a04693..ea1476c 100644
--- a/北京北汽/Models/ScpEntity/TB_ASN.cs
+++ b/北京北汽/Models/ScpEntity/TB_ASN.cs
@@ -14,61 +14,61 @@ namespace CK.SCP.Models.ScpEntity
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
- public partial class V_TB_PO_PLAN_EXTEND
- {
+ //public partial class V_TB_PO_PLAN_EXTEND
+ //{
- [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
- [Key]
- public long UID { get; set; }
- public string Domain { get; set; }
+ // [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+ // [Key]
+ // public long UID { get; set; }
+ // public string Domain { get; set; }
- public string PartCode { get; set; }
- public Nullable EndTime { get; set; }
- public string PoBillNum { get; set; }
- public string Site { get; set; }
- public string AskBillNum { get; set; }
- public string Version { get; set; }
+ // public string PartCode { get; set; }
+ // public Nullable EndTime { get; set; }
+ // public string PoBillNum { get; set; }
+ // public string Site { get; set; }
+ // public string AskBillNum { get; set; }
+ // public string Version { get; set; }
- public string PartDesc { get; set; }
+ // public string PartDesc { get; set; }
- public decimal PlanQty { get; set; }
- public string PoUnit { get; set; }
- public int PoLine { get; set; }
- public string VendId { get; set; }
+ // public decimal PlanQty { get; set; }
+ // public string PoUnit { get; set; }
+ // public int PoLine { get; set; }
+ // public string VendId { get; set; }
- public string ProjectId { get; set; }
- public string IsPlan { get; set; }
+ // public string ProjectId { get; set; }
+ // public string IsPlan { get; set; }
- [NotMapped]
- public List UserInAddress { set; get; }
+ // [NotMapped]
+ // public List UserInAddress { set; get; }
- [NotMapped]
- public List UserInVendIds { set; get; }
+ // [NotMapped]
+ // public List UserInVendIds { set; get; }
- [NotMapped]
- public List BillStateList { set; get; }
+ // [NotMapped]
+ // public List BillStateList { set; get; }
- [NotMapped]
- public DateTime? EndTime_Begin { set; get; }
- [NotMapped]
- public DateTime? EndTime_End { set; get; }
- }
- public partial class V_TB_PO_PLAN_DETAIL
- {
- [Key]
- public long UID { get; set; }
- public string PoBillNum { get; set; }
- public string VendId { get; set; }
- public Nullable EndTime { get; set; }
- public string PartCode { get; set; }
- public string AskBillNum { get; set; }
- public string Version { get; set; }
- public string Domain { get; set; }
- public decimal PlanQty { get; set; }
- public string PoUnit { get; set; }
+ // [NotMapped]
+ // public DateTime? EndTime_Begin { set; get; }
+ // [NotMapped]
+ // public DateTime? EndTime_End { set; get; }
+ //}
+ //public partial class V_TB_PO_PLAN_DETAIL
+ //{
+ // [Key]
+ // public long UID { get; set; }
+ // public string PoBillNum { get; set; }
+ // public string VendId { get; set; }
+ // public Nullable EndTime { get; set; }
+ // public string PartCode { get; set; }
+ // public string AskBillNum { get; set; }
+ // public string Version { get; set; }
+ // public string Domain { get; set; }
+ // public decimal PlanQty { get; set; }
+ // public string PoUnit { get; set; }
- }
+ //}
public partial class TB_ASN:RecordEntity
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/北京北汽/SCP/SCP.csproj b/北京北汽/SCP/SCP.csproj
index 08141f1..cb10e79 100644
--- a/北京北汽/SCP/SCP.csproj
+++ b/北京北汽/SCP/SCP.csproj
@@ -2930,6 +2930,8 @@
+
+
@@ -5482,6 +5484,20 @@
SCP_ASK.aspx
+
+ SCP_PO_BJPLAN.aspx
+ ASPXCodeBehind
+
+
+ SCP_PO_BJPLAN.aspx
+
+
+ SCP_PO_PLAN_DETAIL.aspx
+ ASPXCodeBehind
+
+
+ SCP_PO_PLAN_DETAIL.aspx
+
SCP_TB_ASK_DETAIL_PO.aspx
ASPXCodeBehind
diff --git a/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx b/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx
index ff88a20..4998dc5 100644
--- a/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx
+++ b/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx
@@ -55,8 +55,8 @@
-
@@ -65,7 +65,6 @@
-
diff --git a/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx.cs b/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx.cs
index 97aef7e..4cc3df8 100644
--- a/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx.cs
+++ b/北京北汽/SCP/Views/BasicData/SCP_MoldSharing.aspx.cs
@@ -44,9 +44,9 @@ namespace SCP.Views.BasicData
}
SearchV_TA_MoldSharingData((result) =>
{
- Grid1.RecordCount = result.Count();
var list = SortAndPage(result, Grid1);
Grid1.DataSource = list;
+ Grid1.RecordCount = result.Count();
Grid1.DataBind();
});
}
@@ -57,8 +57,16 @@ namespace SCP.Views.BasicData
public void SearchV_TA_MoldSharingData(Action> p_action)
{
V_TA_MOLDSHARING _entity = new V_TA_MOLDSHARING();
- _entity.VendId = CurrentUser.VenderList.FirstOrDefault();
-
+ if (!string.IsNullOrEmpty(textVendId.Text))
+ {
+ _entity.VendId = textVendId.Text.Trim();
+ }
+ if (!string.IsNullOrEmpty(textPartCode.Text))
+ {
+ _entity.PartCode = textPartCode.Text.Trim();
+ }
+ _entity.Site = CurrentUser.UsedDomain;
+
SCP_MoldSharing_Controller.Get_V_TA_MoldSharing_List(_entity, (_ret) =>
{
if (_ret.State == ReturnStatus.Succeed)
diff --git a/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
index 424e4b9..557a1c6 100644
--- a/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
+++ b/北京北汽/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
@@ -120,10 +120,10 @@ namespace SCP.PlanData
_entity.DayState = int.Parse(ddl_DayState.SelectedValue);
_entity.IsDeleted = false;
_entity.Site = CurrentUser.UsedDomain;
- if (CurrentUser.VenderList.Count > 0)
- {
- _entity.VendId = CurrentUser.VenderList.FirstOrDefault();
- }
+ //if (CurrentUser.VenderList.Count > 0)
+ //{
+ // _entity.VendId = CurrentUser.VenderList.FirstOrDefault();
+ //}
_entity.SubSite = CurrentUser.UserdSite;
diff --git a/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
index ade9074..ab6f57d 100644
--- a/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
+++ b/北京北汽/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
@@ -434,14 +434,15 @@ namespace SCP.PlanData
Alert.Show(_str);
return;
}
- if (CurrentUser.FactoryList != null && CurrentUser.FactoryList.Count > 0)
- {
- if (CurrentUser.FactoryList.FirstOrDefault() == "CQBMPT")
- {
- qadOrder.Remark = "";
- qadOrderList.ForEach(p => { p.Remark = string.Empty; });
- }
- }
+ // 重庆看板备注 展示
+ //if (CurrentUser.FactoryList != null && CurrentUser.FactoryList.Count > 0)
+ //{
+ // if (CurrentUser.FactoryList.FirstOrDefault() == "CQBMPT")
+ // {
+ // qadOrder.Remark = "";
+ // qadOrderList.ForEach(p => { p.Remark = string.Empty; });
+ // }
+ //}
string Ssite = "";
if ((CurrentUser.UserdSite == "CQ01") || (CurrentUser.UserdSite == "CD01"))
{
diff --git a/北京北汽/UniApiWpf/MainWindow.xaml.cs b/北京北汽/UniApiWpf/MainWindow.xaml.cs
index ed650d2..d99552a 100644
--- a/北京北汽/UniApiWpf/MainWindow.xaml.cs
+++ b/北京北汽/UniApiWpf/MainWindow.xaml.cs
@@ -210,6 +210,26 @@ namespace UniApiWpf
{
#region
SCP_DC_UNI_CONTROLLER.ReadService((rs) =>
+ {
+ List _list = new List();
+ if (rs.State == ReturnStatus.Succeed)
+ {
+ rs.MessageList.ForEach(p =>
+ {
+ _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p, rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId = rs.Message.ToString(), });
+ });
+ CreateLogDataList(_list, WriteLogEnum.Get);
+ }
+ else
+ {
+ rs.ErrorList.ForEach(p =>
+ {
+ _list.Add(new LogModel() { LogMessage = string.Format("{0}任务:{1}", p.Message, rs.Message.ToString()), LogTime = DateTime.Now.ToShortDateString(), TableName = "", TaskId = rs.Message.ToString(), });
+ });
+ CreateLogDataList(_list, WriteLogEnum.Get);
+ }
+ });
+ SCP_DC_UNI_CONTROLLER.BaseReadService((rs) =>
{
List _list = new List();
if (rs.State == ReturnStatus.Succeed)