Huabao
/
FactorySystemApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改申请查询=》Bom清单

Browse Source
master
Yang 2 years ago
parent 70599d3c02
commit c03c3c409c
5 changed files with 482 additions and 232 deletions
Show Stats Download Patch File Download Diff File

359
FactorySystemApi/Controllers/FormulaController.cs
Unescape View File

@ -375,7 +375,7 @@ namespace FactorySystemApi.Controllers
TFS_Formula formula = formulas[0]; TFS_Formula formula = formulas[0];
OAService oAService = new OAService(); OAService oAService = new OAService();
string bomListStr = ""; string bomListStr = "";
Dictionary<string, object> bomResult = null;
List<Specifications> specifList = new List<Specifications>() { new Specifications() }; List<Specifications> specifList = new List<Specifications>() { new Specifications() };
specifList[0].SP = formula.FPlmCode; specifList[0].SP = formula.FPlmCode;
@ -392,89 +392,316 @@ namespace FactorySystemApi.Controllers
if (restResult != null && restResult.data != null) if (restResult != null && restResult.data != null)
{ {
List<BomModel> bomList = JsonConvert.DeserializeObject<List<BomModel>>(restResult.data.ToString()); List<BomModel> bomList = JsonConvert.DeserializeObject<List<BomModel>>(restResult.data.ToString());
string materialCodes = ",";
string testCodes = ",";
//string materialCodes = ",";
//string testCodes = ",";
if (bomList != null && bomList.Count > 0) if (bomList != null && bomList.Count > 0)
{ {
List<BomModel> subBomList = bomList[0].Specifications; bomResult = CheckBomMaterial(bomList, 0, new Random());
//List<BomModel> subBomList = bomList[0].Specifications;
//if (subBomList != null && subBomList.Count > 0)
//{
// foreach(BomModel bom in subBomList)
// {
// string bomType = bom.Type.ToLower(); // 转小写
// if (bomType == "a" || bomType == "f")
// {
// bom.ABomType = "20";
// }
// else if (bomType == "b" || bomType == "bb" || bomType == "i" || bomType == "iz")
// {
// bom.ABomType = "30";
// }
// else
// {
// bom.ABomType = "40";
// }
// if ("40".Equals(bom.ABomType))
// {
// bom.ASapCode = bom.SP_VALUE;
// materialCodes = materialCodes + bom.ASapCode + ",";
// }
// else
// {
// bom.ATestCode = bom.SP_VALUE;
// testCodes = testCodes + bom.ATestCode + ",";
// }
// }
// List<TFS_ViewMaterial> viewsByMaterialCodes = FormulaBll.GetViewByMaterialCodes(materialCodes);
// List<TFS_ViewMaterial> viewsByTestCodes = FormulaBll.GetViewByTestCodes(testCodes);
// foreach (BomModel bom in subBomList)
// {
// if ("40".Equals(bom.ABomType))
// {
// if (viewsByMaterialCodes != null && viewsByMaterialCodes.Count > 0)
// {
// TFS_ViewMaterial view = viewsByMaterialCodes.Find(v => v.FBaseMaterialCode.Equals(bom.ASapCode));
// if (view != null)
// {
// bom.AMaterialCode = view.FSaleOldMaterialCode;
// }
// }
// }
// else
// {
// if (viewsByTestCodes != null && viewsByTestCodes.Count > 0)
// {
// TFS_ViewMaterial view = viewsByTestCodes.Find(v => v.FBaseTestCode.Equals(bom.ATestCode));
// if (view != null)
// {
// bom.AMaterialCode = view.FSaleOldMaterialCode;
// bom.ASapCode = view.FBaseMaterialCode;
// }
// }
// }
// }
// int formulaApplyHistoryId = FormulaBll.AddFormulaApplyHistroy(formula, user.FName, user.FID);
// resultObj.Add("applyHistoryId", formulaApplyHistoryId);
// resultObj.Add("bomList", bomList);
// bomListStr = JsonConvert.SerializeObject(resultObj);
//}
}
}
if (subBomList != null && subBomList.Count > 0) apiResult.Data = bomResult;
{
foreach(BomModel bom in subBomList)
{
string bomType = bom.Type.ToLower(); // 转小写
if (bomType == "a" || bomType == "f")
{
bom.ABomType = "20";
}
else if (bomType == "b" || bomType == "bb" || bomType == "i" || bomType == "iz")
{
bom.ABomType = "30";
}
else
{
bom.ABomType = "40";
}
if ("40".Equals(bom.ABomType)) }
{ }, apiResult, Request);
bom.ASapCode = bom.SP_VALUE; }
materialCodes = materialCodes + bom.ASapCode + ",";
}
else
{
bom.ATestCode = bom.SP_VALUE;
testCodes = testCodes + bom.ATestCode + ",";
}
}
List<TFS_ViewMaterial> viewsByMaterialCodes = FormulaBll.GetViewByMaterialCodes(materialCodes);
List<TFS_ViewMaterial> viewsByTestCodes = FormulaBll.GetViewByTestCodes(testCodes);
foreach (BomModel bom in subBomList) /// <summary>
{ /// 递归梳理BOM
if ("40".Equals(bom.ABomType)) /// </summary>
{ /// <param name="dataList">需要解析的集合</param>
if (viewsByMaterialCodes != null && viewsByMaterialCodes.Count > 0) /// <param name="materLevel">层级</param>
{ /// <param name="random">内部定义会有问题，需要外部传入</param>
TFS_ViewMaterial view = viewsByMaterialCodes.Find(v => v.FBaseMaterialCode.Equals(bom.ASapCode)); /// <param name="parentId">父子级关系ID</param>
if (view != null) private Dictionary<string, object> CheckBomMaterial(List<BomModel> dataList, int materLevel, Random random, int parentId = -1)
{ {
bom.AMaterialCode = view.FSaleOldMaterialCode; List<TFS_Material> mateList = new List<TFS_Material>();
} List<TFS_ViewMaterial> viewList = new List<TFS_ViewMaterial>();
} List<TFS_Formula> formulaList = new List<TFS_Formula>();
} string ids1 = "", ids2 = "";//需求变更ids2弃用
else string materialCodes = ",";
{ string testCodes = ",";
if (viewsByTestCodes != null && viewsByTestCodes.Count > 0) if (dataList != null && dataList.Count > 0)
{ {
TFS_ViewMaterial view = viewsByTestCodes.Find(v => v.FBaseTestCode.Equals(bom.ATestCode)); foreach (BomModel item in dataList)
if (view != null) {
{ if (!string.IsNullOrWhiteSpace(item.SP))
bom.AMaterialCode = view.FSaleOldMaterialCode; {
bom.ASapCode = view.FBaseMaterialCode; item.Code = item.SP;
} }
} if (!string.IsNullOrWhiteSpace(item.SP_Version))
} {
} item.Version = item.SP_Version;
}
if (!string.IsNullOrWhiteSpace(item.SP_VALUE))
{
item.TestNO = item.SP_VALUE;
}
int formulaApplyHistoryId = FormulaBll.AddFormulaApplyHistroy(formula, user.FName, user.FID); int dataId = random.Next(1, 99) * random.Next(1, 99);
dataId += random.Next(10, 99) * random.Next(10, 99) * 2;
dataId += random.Next(1, 99) * random.Next(1, 99) * 10;
TFS_Material material = new TFS_Material()
{
FID = DateTime.Now.DayOfYear * 10 + dataId,
FPlmCode = item.Code,
FName = item.Name,
//FCode = item.Code,
FType = item.Type.ToLower(),
//FTestCode = item.TestNO,
FVersionCode = item.Version,
FParentID = parentId
};
resultObj.Add("applyHistoryId", formulaApplyHistoryId); TFS_ViewMaterial view = new TFS_ViewMaterial()
resultObj.Add("bomList", bomList); {
//FBaseFameCode = "",
//FBaseMaterialCode = material.FCode,
//FBaseTestCode = material.FTestCode,
FExtraQuantity = item.Quantity,
FBaseMaterialDesc = material.FName,
FLevel = materLevel,
FBomMaterialID = material.FID
};
if (material.FType == "a" || material.FType == "f")
{
material.FType = "20";
}
else if (material.FType == "b" || material.FType == "bb" || material.FType == "i" || material.FType == "iz")
{
material.FType = "30";
}
else
{
material.FType = "40";
}
bomListStr = JsonConvert.SerializeObject(resultObj); if ("40".Equals(material.FType))
{
item.ASapCode = item.SP_VALUE;
materialCodes = materialCodes + item.ASapCode + ",";
item.ATestCode = "";
}
else
{
item.ATestCode = item.SP_VALUE;
testCodes = testCodes + item.ATestCode + ",";
}
List<TFS_ViewMaterial> viewsByMaterialCodes = FormulaBll.GetViewByMaterialCodes(materialCodes);
List<TFS_ViewMaterial> viewsByTestCodes = FormulaBll.GetViewByTestCodes(testCodes);
MaterialBll materialBll = new MaterialBll();
TFS_Material tFS_Material = materialBll.GetMaterialListByFTestCode(item.SP_VALUE).LastOrDefault();
if ("40".Equals(material.FType))
{
item.AMaterialCode = item.SP_VALUE;
if (tFS_Material != null)
{
item.ASapCode = tFS_Material.OldCode;
}
else
{
item.ASapCode = "";
}
}
else
{
if (viewsByTestCodes != null && viewsByTestCodes.Count > 0)
{
//TFS_ViewMaterial view2 = viewsByTestCodes.Find(v => v.FBaseTestCode.Equals(item.ATestCode));
if (tFS_Material != null)
{
item.AMaterialCode = tFS_Material.FCode;
item.ASapCode = tFS_Material.OldCode;
//item.AMaterialCode = view2.FSaleOldMaterialCode;
//item.ASapCode = view2.FBaseMaterialCode;
}
else
{
item.ASapCode = "";
} }
} }
} }
item.ABomType = "kg";
apiResult.Data = bomListStr; if (item.Name.Contains("@"))
{
item.EnName = "甜味";
}
else if (item.Name.Contains("□"))
{
item.EnName = "咸味";
}
else {
item.EnName = "";
}
if (materLevel == 0)
{
material.FType = "20";
ids2 = material.FID + "";
}
if (material.FType == "40")
{
material.FCode = item.TestNO;
//material.FPlmCode = "";
}
int.TryParse(material.FType, out int mType);
if (materLevel == 1) ids1 += material.FID + ",";
switch (mType)
{
case (int)Constant.MaterialType.产成品:
material.FTestCode = item.TestNO;
view.FBaseTestCode = item.TestNO;
view.FViewType = 1;
break;
case (int)Constant.MaterialType.半成品:
view.FViewType = (int)Constant.ViewType.半成品视图;
material.FTestCode = item.TestNO;
view.FBaseTestCode = item.TestNO;
break;
case (int)Constant.MaterialType.中间品:
view.FViewType = material.FName.Contains("香基") ? (int)Constant.ViewType.香基视图 : (int)Constant.ViewType.中间品视图;
material.FTestCode = item.TestNO;
view.FBaseTestCode = item.TestNO;
break;
case (int)Constant.MaterialType.原辅料:
view.FViewType = (int)Constant.ViewType.原料视图;
view.FBaseMaterialCode = material.FCode;
//默认值不同
view.FPurchaseCompany = "kg";
view.FPurchaseCompanyCount = "1";
view.FPurchaseBaseCompanyCount = "1000";
view.FSaleAccountSettingGroup = "15";
view.FStorageTotalShelfLife = "7300";
view.FMRP2ExternalStoragePlace = "1000";
view.FPlanUnlimitedOverDelivery = "";
view.FAccountPriceControl = "V";
view.FAccountPriceDetermine = "2";
view.FAccountAccessType = "1000";
view.FAccountSaleOrderInventory = "1010";
break;
}
mateList.Add(material);
viewList.Add(view);
if (item.Specifications != null && item.Specifications.Count > 0)
{
Dictionary<string, object> childData = CheckBomMaterial(item.Specifications, materLevel + 1, random, material.FID);
if (materLevel >= 1)
{
formulaList.Add(new TFS_Formula()
{
FID = -1,
FName = material.FName,
FType = material.FType,
FTestCode = material.FTestCode,
FVersionCode = material.FVersionCode,
FPlmCode = string.IsNullOrEmpty(material.FPlmCode) ? material.FCode : material.FPlmCode
});
}
mateList.AddRange((List<TFS_Material>)childData["mateList"]);
viewList.AddRange((List<TFS_ViewMaterial>)childData["viewList"]);
formulaList.AddRange((List<TFS_Formula>)childData["formulaList"]);
ids1 = ids1.Trim(',') + "," + childData["formulaIds"] + ",";
ids2 = ids2.Trim(',') + "," + childData["halfIds"] + ",";
}
} }
}, apiResult, Request); }
return new Dictionary<string, object>
{
{ "mateList", mateList },
{ "viewList", viewList },
{ "formulaList", formulaList },
{ "formulaIds", ids1.Trim(',') },
{ "halfIds", ids2.Trim(',') },
{ "bomList", dataList }
};
} }
/// <summary> /// <summary>
/// 根据物料号列表获取物料列表 /// 根据物料号列表获取物料列表
/// </summary> /// </summary>

26
FactorySystemApi/Controllers/TeamworkController.cs
Unescape View File

@ -700,7 +700,7 @@ namespace FactorySystemApi.Controllers
FName = item.Name, FName = item.Name,
//FCode = item.Code, //FCode = item.Code,
FType = item.Type.ToLower(), FType = item.Type.ToLower(),
FTestCode = item.TestNO, //FTestCode = item.TestNO,
FVersionCode = item.Version, FVersionCode = item.Version,
FParentID = parentId FParentID = parentId
}; };
@ -709,7 +709,7 @@ namespace FactorySystemApi.Controllers
{ {
//FBaseFameCode = "", //FBaseFameCode = "",
//FBaseMaterialCode = material.FCode, //FBaseMaterialCode = material.FCode,
FBaseTestCode = material.FTestCode, //FBaseTestCode = material.FTestCode,
FExtraQuantity = item.Quantity, FExtraQuantity = item.Quantity,
FBaseMaterialDesc = material.FName, FBaseMaterialDesc = material.FName,
FLevel = materLevel, FLevel = materLevel,
@ -735,8 +735,8 @@ namespace FactorySystemApi.Controllers
} }
if (material.FType == "40") if (material.FType == "40")
{ {
material.FCode = material.FPlmCode; material.FCode = item.TestNO;
material.FPlmCode = ""; //material.FPlmCode = "";
} }
int.TryParse(material.FType, out int mType); int.TryParse(material.FType, out int mType);
@ -744,13 +744,19 @@ namespace FactorySystemApi.Controllers
switch (mType) switch (mType)
{ {
case (int)Constant.MaterialType.产成品: case (int)Constant.MaterialType.产成品:
material.FTestCode = item.TestNO;
view.FBaseTestCode=item.TestNO;
view.FViewType = 1; view.FViewType = 1;
break; break;
case (int)Constant.MaterialType.半成品: case (int)Constant.MaterialType.半成品:
view.FViewType = (int)Constant.ViewType.半成品视图; view.FViewType = (int)Constant.ViewType.半成品视图;
material.FTestCode = item.TestNO;
view.FBaseTestCode = item.TestNO;
break; break;
case (int)Constant.MaterialType.中间品: case (int)Constant.MaterialType.中间品:
view.FViewType = material.FName.Contains("香基") ? (int)Constant.ViewType.香基视图 : (int)Constant.ViewType.中间品视图; view.FViewType = material.FName.Contains("香基") ? (int)Constant.ViewType.香基视图 : (int)Constant.ViewType.中间品视图;
material.FTestCode = item.TestNO;
view.FBaseTestCode = item.TestNO;
break; break;
case (int)Constant.MaterialType.原辅料: case (int)Constant.MaterialType.原辅料:
view.FViewType = (int)Constant.ViewType.原料视图; view.FViewType = (int)Constant.ViewType.原料视图;
@ -1221,11 +1227,20 @@ namespace FactorySystemApi.Controllers
else if (field.FName == "固定损耗数量" && intType == 2) else if (field.FName == "固定损耗数量" && intType == 2)
{ {
selectSql += string.Format(@"isnull(CASE selectSql += string.Format(@"isnull(CASE
WHEN TFS_Material.FFixedLoss='(空)' THEN '' WHEN TFS_Material.FFixedLoss='(空)' OR TFS_Material.FFixedLoss=0 THEN ''
ELSE TFS_Material.FFixedLoss ELSE TFS_Material.FFixedLoss
END END
,'') as '{1}'", field.FField, field.FName); ,'') as '{1}'", field.FField, field.FName);
} }
//else if (field.FName == "组件损耗率" && intType == 5)
//{
// selectSql += string.Format(@"isnull(
// isnull(
// (select CAST ( 100.0 - TFS_MaterialInfo.FTheoryYield AS VARCHAR ) from TFS_MaterialInfo where FDataID=(select TOP 1 FMaterialID from TFS_ViewMaterial where FTeamID={0}) AND TFS_MaterialInfo.FTheoryYield <>'(空)' AND TFS_MaterialInfo.FTheoryYield<>'' AND TFS_MaterialInfo.FTheoryYield IS NOT NULL),
// ''
// ),'') AS '组件损耗率'", teamId);
//}
else else
{ {
selectSql += string.Format("isnull({0},'') as '{1}'", field.FField, field.FName); selectSql += string.Format("isnull({0},'') as '{1}'", field.FField, field.FName);
@ -1473,6 +1488,7 @@ namespace FactorySystemApi.Controllers
DataTable dataList2 = dataList.Copy(); DataTable dataList2 = dataList.Copy();
for (int i = 0; i < rowCount; i++) for (int i = 0; i < rowCount; i++)
{ {
dataList2.Rows[i]["版本"] = "0002";
if (isChange && dataList2.Rows[i]["BOM用途"].ToString() == "1") if (isChange && dataList2.Rows[i]["BOM用途"].ToString() == "1")
{ {
dataList2.Rows[i]["BOM用途"] = "Y"; dataList2.Rows[i]["BOM用途"] = "Y";

321
FactorySystemApi/Web.config
Unescape View File

@ -4,44 +4,45 @@
https://go.microsoft.com/fwlink/?LinkId=301879 https://go.microsoft.com/fwlink/?LinkId=301879
--> -->
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="FactorySystemApi.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> <section name="FactorySystemApi.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<appSettings> <appSettings>
<add key="ApiAuthSecretKey" value="zhkxfs" /> <add key="ApiAuthSecretKey" value="zhkxfs" />
<!--<add key="ConnectionString" value="server=49.235.68.145,3456;uid=sa;pwd=zhenxuan@2019;database=FactorySystem" />--> <!--<add key="ConnectionString" value="server=49.235.68.145,3456;uid=sa;pwd=zhenxuan@2019;database=FactorySystem" />-->
<add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" /> <!--<add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />-->
<!--<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />--> <add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />
<!--<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />-->
<add key="Sap_UserName" value="mcs_con" /> <add key="Sap_UserName" value="mcs_con" />
<add key="Sap_Upload_UserName" value="plm_com" /> <add key="Sap_Upload_UserName" value="plm_com" />
<add key ="Plm_Formula_Username" value="PFWL"/> <add key ="Plm_Formula_Username" value="PFWL"/>
<add key ="Plm_Formula_Password" value="610F64FD-9645-4ABE-AFFC-0A6905D2760F"/> <add key ="Plm_Formula_Password" value="610F64FD-9645-4ABE-AFFC-0A6905D2760F"/>
<add key="SendWeChatMsg" value="1" /> <add key="SendWeChatMsg" value="1" />
<add key="Sap_Password" value="abcd1234" /> <add key="Sap_Password" value="abcd1234" />
<add key="Cas_AppId" value="testsso" /> <add key="Cas_AppId" value="testsso" />
<add key="Cas_OAUrl" value="http://10.10.128.20/esc-sso/" /> <add key="Cas_OAUrl" value="http://10.10.128.20/esc-sso/" />
<add key="Cas_ReUrl" value="http://2.0.1.18:3000" /> <add key="Cas_ReUrl" value="http://2.0.1.18:3000" />
<!--<add key="Mdm_Token" value="ac9b7db8-9661-461d-b5b2-ed66f33a1d69" />--> <!--<add key="Mdm_Token" value="ac9b7db8-9661-461d-b5b2-ed66f33a1d69" />-->
<add key="Mdm_Token" value="a44d2d12-ff95-41db-a7f3-302fc05ab82e" /> <add key="Mdm_Token" value="a44d2d12-ff95-41db-a7f3-302fc05ab82e" />
<add key="Mdm_Url" value="http://10.10.141.80:8080/iuapmdm/cxf/mdmrs/newcenter/newCenterService/insertMd" /> <add key="Mdm_Url" value="http://10.10.141.80:8080/iuapmdm/cxf/mdmrs/newcenter/newCenterService/insertMd" />
<add key="Mdm_Tid" value="tenan" /> <add key="Mdm_Tid" value="tenan" />
<!--发送微信消息：1是0否--> <!--发送微信消息：1是0否-->
<add key="SendWeChatMsg" value="0" /> <add key="SendWeChatMsg" value="0" />
<add key="webpages:Version" value="3.0.0.0" /> <add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" /> <add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" /> <add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" /> <add key="UnobtrusiveJavaScriptEnabled" value="true" />
</appSettings> </appSettings>
<!-- <!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。 有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
可在 <httpRuntime> 标记上设置以下特性。 可在 <httpRuntime> 标记上设置以下特性。
@ -49,133 +50,133 @@
<httpRuntime targetFramework="4.5.2" /> <httpRuntime targetFramework="4.5.2" />
</system.Web> </system.Web>
--> -->
<system.web> <system.web>
<compilation debug="true" targetFramework="4.8" /> <compilation debug="true" targetFramework="4.8" />
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5" />
</system.web> </system.web>
<system.webServer> <system.webServer>
<handlers> <handlers>
<add name="OPTIONS" path="*" verb="OPTIONS" modules="ProtocolSupportModule" resourceType="Unspecified" /> <add name="OPTIONS" path="*" verb="OPTIONS" modules="ProtocolSupportModule" resourceType="Unspecified" />
<remove name="ExtensionlessUrlHandler-Integrated-4.0" /> <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="TRACEVerbHandler" /> <remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers> </handlers>
<httpProtocol> <httpProtocol>
<!--跨域配置开始--> <!--跨域配置开始-->
<customHeaders> <customHeaders>
<add name="Access-Control-Allow-Origin" value="*" /> <add name="Access-Control-Allow-Origin" value="*" />
<add name="Access-Control-Allow-Methods" value="GET,POST,OPTIONS" /> <add name="Access-Control-Allow-Methods" value="GET,POST,OPTIONS" />
<add name="Access-Control-Allow-Headers" value="*" /> <add name="Access-Control-Allow-Headers" value="*" />
<add name="Access-Control-Request-Methods" value="GET,POST,OPTIONS" /> <add name="Access-Control-Request-Methods" value="GET,POST,OPTIONS" />
</customHeaders> </customHeaders>
<!--跨域配置结束--> <!--跨域配置结束-->
</httpProtocol> </httpProtocol>
</system.webServer> </system.webServer>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" /> <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" /> <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>
<compilers> <compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" /> <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" /> <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
</compilers> </compilers>
</system.codedom> </system.codedom>
<applicationSettings> <applicationSettings>
<FactorySystemApi.Properties.Settings> <FactorySystemApi.Properties.Settings>
<setting name="WeChatMsg" serializeAs="String"> <setting name="WeChatMsg" serializeAs="String">
<value>http://dd.hbflavor.com:28888/PlmMsg/SendPLMMsgInterface.asmx</value> <value>http://dd.hbflavor.com:28888/PlmMsg/SendPLMMsgInterface.asmx</value>
</setting> </setting>
<setting name="Sap_Material" serializeAs="String"> <setting name="Sap_Material" serializeAs="String">
<value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_mm100_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm</value> <value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_mm100_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm</value>
</setting> </setting>
<setting name="SAP_Formula" serializeAs="String"> <setting name="SAP_Formula" serializeAs="String">
<value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp062_bc_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp</value> <value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp062_bc_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp</value>
</setting> </setting>
<setting name="Sap_Group" serializeAs="String"> <setting name="Sap_Group" serializeAs="String">
<value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp071_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp</value> <value>http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp071_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp</value>
</setting> </setting>
<setting name="Plm_Formula" serializeAs="String"> <setting name="Plm_Formula" serializeAs="String">
<value>https://plmtest.hbflavor.com/PlmWebService/OAService.asmx</value> <value>https://plmtest.hbflavor.com/PlmWebService/OAService.asmx</value>
</setting> </setting>
</FactorySystemApi.Properties.Settings> </FactorySystemApi.Properties.Settings>
</applicationSettings> </applicationSettings>
<system.serviceModel> <system.serviceModel>
<bindings> <bindings>
<basicHttpBinding> <basicHttpBinding>
<binding name="si_pp079_mcs_senderBinding"> <binding name="si_pp079_mcs_senderBinding">
<security mode="TransportCredentialOnly"> <security mode="TransportCredentialOnly">
<transport clientCredentialType="Basic" /> <transport clientCredentialType="Basic" />
<message clientCredentialType="UserName" /> <message clientCredentialType="UserName" />
</security> </security>
</binding> </binding>
<binding name="si_pp080_mcs_senderBinding"> <binding name="si_pp080_mcs_senderBinding">
<security mode="TransportCredentialOnly"> <security mode="TransportCredentialOnly">
<transport clientCredentialType="Basic" /> <transport clientCredentialType="Basic" />
<message clientCredentialType="UserName" /> <message clientCredentialType="UserName" />
</security> </security>
</binding> </binding>
<binding name="si_mm104_mcs_senderBinding"> <binding name="si_mm104_mcs_senderBinding">
<security mode="TransportCredentialOnly"> <security mode="TransportCredentialOnly">
<transport clientCredentialType="Basic" /> <transport clientCredentialType="Basic" />
<message clientCredentialType="UserName" /> <message clientCredentialType="UserName" />
</security> </security>
</binding> </binding>
<binding name="OAServiceSoap"> <binding name="OAServiceSoap">
<security mode="Transport" /> <security mode="Transport" />
</binding> </binding>
<binding name="OAServiceSoap1" /> <binding name="OAServiceSoap1" />
</basicHttpBinding> </basicHttpBinding>
</bindings> </bindings>
<client> <client>
<endpoint address="http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp079_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp" <endpoint address="http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp079_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp"
binding="basicHttpBinding" bindingConfiguration="si_pp079_mcs_senderBinding" binding="basicHttpBinding" bindingConfiguration="si_pp079_mcs_senderBinding"
contract="Sap_Bom.si_pp079_mcs_sender" name="HTTP_Port" /> contract="Sap_Bom.si_pp079_mcs_sender" name="HTTP_Port" />
<endpoint address="http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp080_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp" <endpoint address="http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_pp080_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fpp"
binding="basicHttpBinding" bindingConfiguration="si_pp080_mcs_senderBinding" binding="basicHttpBinding" bindingConfiguration="si_pp080_mcs_senderBinding"
contract="Sap_ProductVersion.si_pp080_mcs_sender" name="HTTP_Port" /> contract="Sap_ProductVersion.si_pp080_mcs_sender" name="HTTP_Port" />
<endpoint address="http://sappodev.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_mm104_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm" <endpoint address="http://sappoqas.hbglobal.com:50000/XISOAPAdapter/MessageServlet?senderParty=&amp;senderService=ZMCS_FLAVOR&amp;receiverParty=&amp;receiverService=&amp;interface=si_mm104_mcs_sender&amp;interfaceNamespace=http%3A%2F%2Fwww.zmc.com%2Fflavor%2Fmm"
binding="basicHttpBinding" bindingConfiguration="si_mm104_mcs_senderBinding" binding="basicHttpBinding" bindingConfiguration="si_mm104_mcs_senderBinding"
contract="Sap_ViewMaterial.si_mm104_mcs_sender" name="HTTP_Port" /> contract="Sap_ViewMaterial.si_mm104_mcs_sender" name="HTTP_Port" />
<endpoint address="https://plmtest.hbflavor.com/PlmWebService/OAService.asmx" <endpoint address="https://plmtest.hbflavor.com/PlmWebService/OAService.asmx"
binding="basicHttpBinding" bindingConfiguration="OAServiceSoap" binding="basicHttpBinding" bindingConfiguration="OAServiceSoap"
contract="Plm_WebSite.OAServiceSoap" name="OAServiceSoap" /> contract="Plm_WebSite.OAServiceSoap" name="OAServiceSoap" />
</client> </client>
</system.serviceModel> </system.serviceModel>
</configuration> </configuration>

2
FactorySystemBll/MaterialBll.cs
Unescape View File

@ -43,6 +43,7 @@ namespace FactorySystemBll
if (factory == null) temp.FFactoryID = -1; if (factory == null) temp.FFactoryID = -1;
else temp.FFactoryID = factory.FID; else temp.FFactoryID = factory.FID;
} }
temp.OldCode = temp.FOldID.ToString();
temp.FAddDate = temp.FEditDate = DateTime.Now; temp.FAddDate = temp.FEditDate = DateTime.Now;
temp.FEditUser = userId; temp.FEditUser = userId;
insertList.Add(temp); insertList.Add(temp);
@ -69,6 +70,7 @@ namespace FactorySystemBll
} }
} }
} }
temp.OldCode = temp.FOldID.ToString();
} }
updateList.Add(temp); updateList.Add(temp);
} }

4
FactorySystemModel/SqlSugarModel/TFS_Material.cs
Unescape View File

@ -488,5 +488,9 @@ namespace FactorySystemModel.SqlSugarModel
/// Nullable:False /// Nullable:False
/// </summary> /// </summary>
public string FSAPDescription { get; set; } public string FSAPDescription { get; set; }
/// <summary>
/// 接收旧码字段
/// </summary>
public string OldCode { get; set; }
} }
} }

Write Preview
Loading…
Cancel
Save