SCP
/
SCPFWBTL
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
钱峰 16 hours ago
parent
31a263f28f
commit
b61ddf7176
12 changed files with 284 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      Controller/SCP_PO_CONTROLLER.cs
  2. 94
      Controller/SCP_TA_LANGUAGE_CONTROLLER.cs
  3. 1
      Models/CK.SCP.Models.csproj
  4. 1
      Models/ScpEntities.cs
  5. 85
      Models/ScpEntity/TA_OperateLog.cs
  6. 2
      Models/ScpEntity/TA_PART.cs
  7. 2
      Models/UniApiEntity/PURReplenishQty.cs
  8. 2
      UniApiGroup/CK.SCP.GrupUniApi.csproj
  9. 2
      UniApiGroup/Controller/NetPriceController.cs
  10. 8
      UniApiGroup/Controller/OdbcApiQadController.cs
  11. 5
      UniApiGroup/Controller/OdbcApiScpController.cs
  12. 8
      UniApiGroup/Controller/PriceController.cs

100
Controller/SCP_PO_CONTROLLER.cs
View File

@ -16,6 +16,7 @@ using System.Threading;
using System.Data;
using Newtonsoft.Json;
using CK.SCP.Models.UniApiEntity;
using CK.SCP.Models.AppBoxEntity;
namespace CK.SCP.Controller
{
@ -3130,6 +3131,26 @@ namespace CK.SCP.Controller
_entity.OtherVendName = p.供应商别名;
db.TA_Appliance.Add(_entity);
string json = JsonConvert.SerializeObject(_entity);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "零件对应基础数据档案";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.BoxType = _entity.BoxType;
log.Enabled = "";
log.PartCode = _entity.PartNumber;
log.PartDesc = _entity.PartDesc1;
log.SubPart = "";
log.Model = _entity.Model;
log.Texture = _entity.Texture;
log.ReceivingPort = _entity.ReceivingPort;
log.PackNumber = _entity.PackNumber.ToString();
log.VendID = _entity.VendID;
log.JsonText = json;
db.TA_OperateLog.Add(log);
}
else
{
@ -3148,8 +3169,30 @@ namespace CK.SCP.Controller
_partde.ReceivingPort = p.收货口;
_partde.OtherVendName = p.供应商别名;
db.TA_Appliance.AddOrUpdate(_partde);
string json = JsonConvert.SerializeObject(_partde);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "零件对应基础数据档案";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.BoxType = _partde.BoxType;
log.Enabled = "";
log.PartCode = _partde.PartNumber;
log.PartDesc = _partde.PartDesc1;
log.SubPart = "";
log.Model = _partde.Model;
log.Texture = _partde.Texture;
log.ReceivingPort = _partde.ReceivingPort;
log.PackNumber = _partde.PackNumber.ToString();
log.VendID = _partde.VendID;
log.JsonText = json;
db.TA_OperateLog.Add(log);
}
});
if (_ret.MessageList.Count == 0)
@ -3433,14 +3476,35 @@ namespace CK.SCP.Controller
{
TA_SubPart subpa = new TA_SubPart();
subpa.SubPart = p.客户零件号;
subpa.PartCode = p.零件号;
db.TA_SubPart.AddOrUpdate(subpa);
string json = JsonConvert.SerializeObject(subpa);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "客户零件号管理";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.PartCode = subpa.PartCode;
log.SubPart = subpa.SubPart;
log.JsonText = json;
db.TA_OperateLog.Add(log);
}
else
{
var subpa = db.TA_SubPart.FirstOrDefault(t => t.PartCode == p.零件号.ToUpper());
subpa.PartCode = p.零件号;
subpa.SubPart = p.客户零件号;
db.TA_SubPart.AddOrUpdate(subpa);
string json = JsonConvert.SerializeObject(subpa);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "客户零件号管理";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.PartCode = subpa.PartCode;
log.SubPart = subpa.SubPart;
log.JsonText = json;
db.TA_OperateLog.Add(log);
}
});
@ -3838,6 +3902,20 @@ namespace CK.SCP.Controller
};
//_venderpart.Model = p.车型.ToUpper();
db.TA_PinFan.AddOrUpdate(_venderpart);
string json = JsonConvert.SerializeObject(_venderpart);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "品番管理";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.PartCode = _venderpart.PartCode;
log.Barcodnt = _venderpart.Barcodnt;
log.Identification = _venderpart.Identification;
log.Operate = "导入";
log.JsonText = json;
db.TA_OperateLog.Add(log);
});
if (_ret.MessageList.Count == 0)
{
@ -3976,6 +4054,17 @@ namespace CK.SCP.Controller
_boxtype.CreateUser = p_creator;
_boxtype.Enabled = p.打印托盘码 == "是" ? true : false;
db.TA_BOXTYPE.AddOrUpdate(_boxtype);
string json = JsonConvert.SerializeObject(_boxtype);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "箱种管理";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.BoxType = _boxtype.BoxType;
log.Enabled = _boxtype.Enabled ? "启用" : "不启用";
log.JsonText = json;
db.TA_OperateLog.Add(log);
});
if (_ret.MessageList.Count == 0)
{
@ -4111,6 +4200,15 @@ namespace CK.SCP.Controller
Car.Model = p.车型;
db.TA_CarModel.AddOrUpdate(Car);
string json = JsonConvert.SerializeObject(Car);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "丰田车型管理";
log.CreateUser = p_creator;
log.CreateTime = DateTime.Now;
log.Operate = "导入";
log.Model = Car.Model;
log.JsonText = json;
});
if (_ret.MessageList.Count == 0)
{

94
Controller/SCP_TA_LANGUAGE_CONTROLLER.cs
View File

@ -10,6 +10,7 @@ using CK.SCP.Models.ScpEntity;
using CK.SCP.Utils;
using System.Data.Entity.Core;
using CK.SCP.Models.Enums;
using Newtonsoft.Json;
namespace CK.SCP.Controller
{
@ -396,7 +397,7 @@ namespace CK.SCP.Controller
return _ret;
}
public static ResultObject<bool> Save_TA_LANGUAGE1(TA_Appliance p_entitys)
public static ResultObject<bool> Save_TA_LANGUAGE1(TA_Appliance p_entitys,string op,User user)
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -435,8 +436,24 @@ namespace CK.SCP.Controller
appliance.OtherVendName = p_entitys.OtherVendName;
db.TA_Appliance.AddOrUpdate(appliance);
}
string json = JsonConvert.SerializeObject(appliance);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "零件对应基础数据档案";
log.CreateUser = user.ChineseName;
log.CreateTime = DateTime.Now;
log.Operate = "删除";
log.BoxType = appliance.BoxType;
log.Enabled = "";
log.PartCode = appliance.PartNumber;
log.PartDesc = appliance.PartDesc1;
log.SubPart = "";
log.Model = appliance.Model;
log.Texture = appliance.Texture;
log.ReceivingPort = appliance.ReceivingPort;
log.PackNumber = appliance.PackNumber.ToString();
log.VendID = appliance.VendID;
log.JsonText = json;
db.TA_OperateLog.Add(log);
if (db.SaveChanges() != -1)
{
@ -674,7 +691,7 @@ namespace CK.SCP.Controller
return _ret;
}
public static ResultObject<bool> Del_TA_LANGUAGE1(string _ls,string _ls1)
public static ResultObject<bool> Del_TA_LANGUAGE1(string _ls,string _ls1,User user)
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -684,7 +701,25 @@ namespace CK.SCP.Controller
var _entity = db.TA_Appliance.Where(p => p.PartNumber == _ls&&p.VendID== _ls1).FirstOrDefault();
string json = JsonConvert.SerializeObject(_entity);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "零件对应基础数据档案";
log.CreateUser = user.ChineseName;
log.CreateTime = DateTime.Now;
log.Operate = "删除";
log.BoxType = _entity.BoxType;
log.Enabled = "";
log.PartCode = _entity.PartNumber;
log.PartDesc = _entity.PartDesc1;
log.SubPart = "";
log.Model = _entity.Model;
log.Texture = _entity.Texture;
log.ReceivingPort = _entity.ReceivingPort;
log.PackNumber = _entity.PackNumber.ToString();
log.VendID = _entity.VendID;
log.JsonText = json;
db.TA_OperateLog.Add(log);
db.TA_Appliance.Remove(_entity);
if (db.SaveChanges() != -1)
{
@ -836,7 +871,7 @@ namespace CK.SCP.Controller
}
return _ret;
}
public static ResultObject<bool> Del_TA_BoxType(string _ls)
public static ResultObject<bool> Del_TA_BoxType(string _ls, User user)
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -847,6 +882,16 @@ namespace CK.SCP.Controller
var _entity = db.TA_BOXTYPE.Where(p => p.BoxType == _ls).FirstOrDefault();
string json = JsonConvert.SerializeObject(_entity);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "箱种管理";
log.CreateUser = user.ChineseName;
log.CreateTime = DateTime.Now;
log.Operate = "刪除";
log.BoxType = _entity.BoxType;
log.Enabled = _entity.Enabled?"启用":"不启用";
log.JsonText = json;
db.TA_OperateLog.Add(log);
db.TA_BOXTYPE.Remove(_entity);
if (db.SaveChanges() != -1)
{
@ -917,7 +962,7 @@ namespace CK.SCP.Controller
}
return _ret;
}
public static ResultObject<bool> Del_TA_PinFan(string _ls)
public static ResultObject<bool> Del_TA_PinFan(string _ls , string name )
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -929,6 +974,19 @@ namespace CK.SCP.Controller
var _entity = db.TA_PinFan.Where(p => p.PartCode == _ls).FirstOrDefault();
db.TA_PinFan.Remove(_entity);
string json = JsonConvert.SerializeObject(_entity);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "品番管理";
log.CreateUser = name;
log.CreateTime = DateTime.Now;
log.PartCode = _entity.PartCode;
log.Barcodnt = _entity.Barcodnt;
log.Identification = _entity.Identification;
log.Operate = "删除";
log.JsonText = json;
db.TA_OperateLog.Add(log);
if (db.SaveChanges() != -1)
{
_ret.State = ReturnStatus.Succeed;
@ -998,7 +1056,7 @@ namespace CK.SCP.Controller
}
return _ret;
}
public static ResultObject<bool> Del_TA_Model(string _Model)
public static ResultObject<bool> Del_TA_Model(string _Model,string name)
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -1010,6 +1068,15 @@ namespace CK.SCP.Controller
var _entity = db.TA_CarModel.Where(p => p.Model == _Model).FirstOrDefault();
db.TA_CarModel.Remove(_entity);
string json = JsonConvert.SerializeObject(_entity);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "丰田车型管理";
log.CreateUser = name;
log.CreateTime = DateTime.Now;
log.Operate = "删除";
log.Model = _entity.Model;
log.JsonText = json;
db.TA_OperateLog.Add(log);
if (db.SaveChanges() != -1)
{
_ret.State = ReturnStatus.Succeed;
@ -1079,7 +1146,7 @@ namespace CK.SCP.Controller
}
return _ret;
}
public static ResultObject<bool> Add_TA_Model(string _Model)
public static ResultObject<bool> Add_TA_Model(string _Model,string name)
{
ResultObject<bool> _ret = new ResultObject<bool>();
try
@ -1094,6 +1161,15 @@ namespace CK.SCP.Controller
TA_CarModel Car = new TA_CarModel();
Car.Model = _Model;
db.TA_CarModel.AddOrUpdate(Car);
string json = JsonConvert.SerializeObject(Car);
TA_OperateLog log = new TA_OperateLog();
log.MenusText = "丰田车型管理";
log.CreateUser = name;
log.CreateTime = DateTime.Now;
log.Operate = "添加";
log.Model = Car.Model;
log.JsonText = json;
db.TA_OperateLog.Add(log);
}

1
Models/CK.SCP.Models.csproj
View File

@ -419,6 +419,7 @@
<Compile Include="ScpEntity\V_FORECAST_REPORT.cs" />
<Compile Include="ScpEntity\V_Pie_Chart.cs" />
<Compile Include="ScpEntity\V_SUPPLIERS_REGUALARLY.cs" />
<Compile Include="ScpEntity\TA_OperateLog.cs" />
<Compile Include="ScpEntity\V_TA_APPLIANCE.cs" />
<Compile Include="ScpEntity\V_TA_SubPartCode.cs" />
<Compile Include="ScpEntity\V_TA_VENDER.cs" />

1
Models/ScpEntities.cs
View File

@ -32,6 +32,7 @@ namespace CK.SCP.Models
{
}
public virtual DbSet<TA_OperateLog> TA_OperateLog { get; set; }
public virtual DbSet<V_TB_REEEE> V_TB_REEEE { set; get; }
public virtual DbSet<TB_SUPPLIER_MAIL> TB_SUPPLIER_MAIL { set; get; }
public virtual DbSet<TA_ProductionLine> TA_ProductionLine { get; set; }

85
Models/ScpEntity/TA_OperateLog.cs
View File

@ -0,0 +1,85 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace CK.SCP.Models.ScpEntity
{
public partial class TA_OperateLog
{
[Key]
public long UID { get; set; }
/// <summary>
/// 菜单名称
/// </summary>
public string MenusText { get; set; }
/// <summary>
/// 操作者
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 操作时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 操作类型 I 导入 U 更新 D 删除 A 新增
/// </summary>
public string Operate { get; set; }
/// <summary>
/// 箱种
/// </summary>
public string BoxType { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public string Enabled { get; set; }
/// <summary>
/// 零件
/// </summary>
public string PartCode { get; set; }
/// <summary>
/// 零件描述
/// </summary>
public string PartDesc { get; set; }
/// <summary>
/// 客户零件号
/// </summary>
public string SubPart { get; set; }
/// <summary>
/// 车型
/// </summary>
public string Model { get; set; }
/// <summary>
/// 材质
/// </summary>
public string Texture { get; set; }
/// <summary>
/// 收货口
/// </summary>
public string ReceivingPort { get; set; }
/// <summary>
/// 标包数
/// </summary>
public string PackNumber { get; set; }
/// <summary>
/// 供应商
/// </summary>
public string VendID { get; set; }
/// <summary>
/// 条码内容
/// </summary>
public string Barcodnt { get; set; }
/// <summary>
/// Code39条码
/// </summary>
public string Identification { get; set; }
/// <summary>
/// 序列化后文本
/// </summary>
public string JsonText { get; set; }
}
}

2
Models/ScpEntity/TA_PART.cs
View File

@ -7,7 +7,7 @@ namespace CK.SCP.Models.ScpEntity
public partial class TA_PART
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[DatabaseGenerated(DatabaseGeneratedOption.Computed)]
public long UID { get; set; }
[Key]

2
Models/UniApiEntity/PURReplenishQty.cs
View File

@ -14,7 +14,7 @@ namespace CK.SCP.Models.UniApiEntity
/// <summary>
/// asn单号
/// </summary>
public string PurAsnBillNum { get; set; }
//public string PurAsnBillNum { get; set; }
public string client { get; set; }
public string plant { get; set; }
}

2
UniApiGroup/CK.SCP.GrupUniApi.csproj
View File

@ -88,7 +88,7 @@
<Reference Include="System.Xml" />
<Reference Include="Z.EntityFramework.Extensions, Version=6.13.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\Z.EntityFramework.Extensions.dll</HintPath>
<HintPath>..\..\..\SCP_怀宁锦恒\Win.Scp\SCP正式版\UniApiGroup\bin\Debug\Z.EntityFramework.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
UniApiGroup/Controller/NetPriceController.cs
View File

@ -63,7 +63,7 @@ namespace CK.SCP.UniApi.Controller
/// <summary>
/// 操作类型
/// </summary>
public string DI_OPERTYPE { get; set; }
//public string DI_OPERTYPE { get; set; }
}
}
}

8
UniApiGroup/Controller/OdbcApiQadController.cs
View File

@ -1251,7 +1251,7 @@ namespace CK.SCP.GrupUniApi.Controller
EndTime = itm.validityEndPeriod,
};
_price.Amt = itm.netPrice;
_price.Extend3 = itm.DI_OPERTYPE;
//_price.Extend3 = itm.DI_OPERTYPE;
PriceList.Add(_price);
}
//存在更新
@ -1261,7 +1261,7 @@ namespace CK.SCP.GrupUniApi.Controller
&& p.StartTime == itm.validityStartPeriod && p.EndTime == itm.validityEndPeriod);
enty.Amt = itm.netPrice;
enty.Remarks = itm.purOrg;
enty.Extend3 = itm.DI_OPERTYPE;
//enty.Extend3 = itm.DI_OPERTYPE;
PriceListUpdate.Add(enty);
}
}
@ -1319,14 +1319,14 @@ namespace CK.SCP.GrupUniApi.Controller
EndTime = itm.validityEndPeriod,
};
_price.Amt = decimal.Parse(itm.purchasePrice);
_price.Extend3 = itm.DI_OPERTYPE;
//_price.Extend3 = itm.DI_OPERTYPE;
PriceList.Add(_price);
}
// 存在判断类型进行更新
else
{
_part.Amt = decimal.Parse(itm.purchasePrice);
_part.Extend3 = itm.DI_OPERTYPE;
//_part.Extend3 = itm.DI_OPERTYPE;
_PRICEs.Add(_part);
}
}

5
UniApiGroup/Controller/OdbcApiScpController.cs
View File

@ -91,10 +91,7 @@ namespace CK.SCP.GrupUniApi.Controller
{
PURDOCNO = erpData.ErpBillNum,
purDocLineNO = erpData.Extend3,
// 增加一列BillNum 用来区分
PurAsnBillNum = erpData.BillNum,
// 发货单里的qty
replenishQty = erpData.Qty,
replenishQty = erpData.PackQty,
client = "800",
plant = erpData.Site

8
UniApiGroup/Controller/PriceController.cs
View File

@ -32,10 +32,10 @@ namespace CK.SCP.UniApi.Controller
public class PURPriceDealMidTab
{
/// <summary>
/// 操作类型
/// </summary>
public string DI_OPERTYPE { get; set; }
///// <summary>
///// 操作类型
///// </summary>
//public string DI_OPERTYPE { get; set; }
/// <summary>
/// 操作批次
/// </summary>

Write Preview
Loading…
Cancel
Save