Luy
/
NWeiWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

no message

master
陆晔 11 months ago
parent
aa8f0e8843
commit
470021afb9
4 changed files with 18 additions and 18 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. 16
      ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs
  2. 14
      ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
  3. BIN
      ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
  4. 6
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

16
ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs
View File

@ -55,8 +55,8 @@ namespace ICSSoft.FromERP
#region 检验合格单同步
foreach (DataRow dr in dt.Rows)
{
SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECK client = new SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECK();
SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECK1 Info = new SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECK1();
SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECK client = new SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECK();
SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECK1 Info = new SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECK1();
if (DocNO != "")
{
Info.PRUEFLOS = DocNO;
@ -73,20 +73,20 @@ namespace ICSSoft.FromERP
Info.CHG_DATE = DateTime.Now.Year + "-" + DateTime.Now.Month.ToString().PadLeft(2, '0') + "-" + DateTime.Now.Day.ToString().PadLeft(2, '0');
}
Info.WERKS = dr["WorkPointCode"].ToString();
Info.ZCHECK_HEAD = new SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_HEAD[1];
Info.ZCHECK_ITEM = new SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM[1];
Info.ZCHECK_HEAD = new SAPGetChkDocInfoZS.ZWMS_SK_CHECK_HEAD[1];
Info.ZCHECK_ITEM = new SAPGetChkDocInfoZS.ZWMS_SK_CHECK_ITEM[1];
SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECKResponse result = new SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECKResponse();
SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECKResponse result = new SAPGetChkDocInfoZS.ZWMS_SK_WS_CHECKResponse();
client.Timeout = 300000;
result = client.CallZWMS_SK_WS_CHECK(Info);
List<SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM> ItemInfoList = new List<SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM>();
List<SAPGetChkDocInfoZS.ZWMS_SK_CHECK_ITEM> ItemInfoList = new List<SAPGetChkDocInfoZS.ZWMS_SK_CHECK_ITEM>();
ItemInfoList.AddRange(result.ZCHECK_ITEM);
foreach (SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_HEAD HeadInfo in result.ZCHECK_HEAD)
foreach (SAPGetChkDocInfoZS.ZWMS_SK_CHECK_HEAD HeadInfo in result.ZCHECK_HEAD)
{
string LineNum = "10";
var ItemInfo = ItemInfoList.Where(a => a.PRUEFLOS == HeadInfo.PRUEFLOS);
foreach (SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM Item in ItemInfo)
foreach (SAPGetChkDocInfoZS.ZWMS_SK_CHECK_ITEM Item in ItemInfo)
{
str = Item.PRUEFLOS;
string ExtensionID = "";

14
ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
View File

@ -135,7 +135,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{
@ -448,7 +448,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{
@ -1199,7 +1199,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{
@ -1739,7 +1739,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{
@ -2044,7 +2044,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{
@ -2358,7 +2358,7 @@ namespace ICSSoft.FromERP
string ColspanAfter;
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
ColspanAfter = Item.VBELN_JS + "~~~" + Item.POSNR_JS + "~~~~~~~~~~";
}
else
@ -2771,7 +2771,7 @@ namespace ICSSoft.FromERP
string Colspan = "";
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~~~~" + Item.POSNR_VA + "~~~~~~~~~~";
Colspan = Item.VBELN_VA + "~~~" + Item.POSNR_VA + "~~~~~~~~~~";
}
else
{

BIN
ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
View File

Binary file not shown.

6
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
View File

@ -1189,13 +1189,13 @@ namespace ICSSoft.DataProject
#region 获取领料单对应料架
string desksql = @" select Desks from ICSMOApply where ApplyCode =(
select top 1 TransCode from ICSContainerReceiptsNumber
where ContainerCode='{0}') and WorkPoint='{1}'";
where ContainerCode='{0}' and EATTRIBUTE5='关联中') and WorkPoint='{1}'";
desksql = string.Format(desksql, JsonData.ContainerCode, JsonData.WorkPoint);
DataTable deskdt = DBHelper.SQlReturnData(desksql, cmd);
if (deskdt.Rows.Count == 0)
{
res.Success = true;
res.Message = "";
res.Success = false;
res.Message = "料架："+ JsonData.ContainerCode + "尚未绑定领料单，请先绑定领料单！";
}
else
{

Write Preview
Loading…
Cancel
Save