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

形态转换同步修改，

master
yangtm 7 months ago
parent
7896204926
commit
92c981fabf
2 changed files with 37 additions and 31 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. 50
      ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
  2. 18
      WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml

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

@ -82,7 +82,7 @@ namespace ICSSoft.FromERP
SAPGetDocInfoZS.ZWMS_SK_WS_HEADResponse result = new SAPGetDocInfoZS.ZWMS_SK_WS_HEADResponse();
client.Timeout = 300000;
result = client.CallZWMS_SK_WS_HEAD(DocInfo);
log.Info(JsonConvert.SerializeObject(result));
List<SAPGetDocInfoZS.ZWMS_SK_HEAD> HeadInfoList = new List<SAPGetDocInfoZS.ZWMS_SK_HEAD>();
@ -2428,17 +2428,17 @@ namespace ICSSoft.FromERP
ExtensionlineAfter.ID = ExtensionAfter;
if (Item.SOBKZ_JS == "E")
{
Extensionline.BatchCode = "";
Extensionline.Version = "";
Extensionline.Brand = Item.POSNR_JS;
Extensionline.ProjectCode = Item.VBELN_JS;
ExtensionlineAfter.BatchCode = "";
ExtensionlineAfter.Version = "";
ExtensionlineAfter.Brand = Item.POSNR_JS;
ExtensionlineAfter.ProjectCode = Item.VBELN_JS;
}
else
{
Extensionline.BatchCode = "";
Extensionline.Version = "";
Extensionline.Brand = "";
Extensionline.ProjectCode = "";
ExtensionlineAfter.BatchCode = "";
ExtensionlineAfter.Version = "";
ExtensionlineAfter.Brand = "";
ExtensionlineAfter.ProjectCode = "";
}
ExtensionlineAfter.cFree1 = "";
ExtensionlineAfter.cFree2 = "";
@ -2456,7 +2456,7 @@ namespace ICSSoft.FromERP
ExtensionlineAfter.MUSERName = "JOB";
ExtensionlineAfter.WorkPoint = Info.WERKS;
db.ICSExtension.InsertOnSubmit(Extensionline);
db.ICSExtension.InsertOnSubmit(ExtensionlineAfter);
db.SubmitChanges();
}
else
@ -2548,11 +2548,17 @@ namespace ICSSoft.FromERP
if (Item.SOBKZ == "E")
{
Colspan = Item.VBELN_VA + "~" + SubInfo.GERNR + "~~" + Item.POSNR_VA + "~~~~~~~~~~";
ColspanAfter = Item.VBELN_JS + "~" + SubInfo.GERNR + "~~" + Item.POSNR_JS + "~~~~~~~~~~";
}
else
{
Colspan = "~" + SubInfo.GERNR + "~~~~~~~~~~~~";
}
if (Item.SOBKZ_JS == "E")
{
ColspanAfter = Item.VBELN_JS + "~" + SubInfo.GERNR + "~~" + Item.POSNR_JS + "~~~~~~~~~~";
}
else
{
ColspanAfter = "~" + SubInfo.GERNR + "~~~~~~~~~~~~";
}
@ -2605,19 +2611,19 @@ namespace ICSSoft.FromERP
ExtensionAfter = AppConfig.GetGuid();
ExtensionlineAfter = new ICSExtension();
ExtensionlineAfter.ID = ExtensionAfter;
if (Item.SOBKZ == "E")
if (Item.SOBKZ_JS == "E")
{
Extensionline.BatchCode = SubInfo.GERNR;
Extensionline.Version = "";
Extensionline.Brand = Item.POSNR_JS;
Extensionline.ProjectCode = Item.VBELN_JS;
ExtensionlineAfter.BatchCode = SubInfo.GERNR;
ExtensionlineAfter.Version = "";
ExtensionlineAfter.Brand = Item.POSNR_JS;
ExtensionlineAfter.ProjectCode = Item.VBELN_JS;
}
else
{
Extensionline.BatchCode = SubInfo.GERNR;
Extensionline.Version = "";
Extensionline.Brand = "";
Extensionline.ProjectCode = "";
ExtensionlineAfter.BatchCode = SubInfo.GERNR;
ExtensionlineAfter.Version = "";
ExtensionlineAfter.Brand = "";
ExtensionlineAfter.ProjectCode = "";
}
ExtensionlineAfter.cFree1 = "";
ExtensionlineAfter.cFree2 = "";
@ -2635,7 +2641,7 @@ namespace ICSSoft.FromERP
ExtensionlineAfter.MUSERName = "JOB";
ExtensionlineAfter.WorkPoint = Info.WERKS;
db.ICSExtension.InsertOnSubmit(Extensionline);
db.ICSExtension.InsertOnSubmit(ExtensionlineAfter);
db.SubmitChanges();
}
else
@ -2659,7 +2665,7 @@ namespace ICSSoft.FromERP
linebefore.WHCode = Item.LGORT.Trim();
linebefore.Quantity = 1;//领用数量
linebefore.Amount = 0;
linebefore.Memo = Item.SOBKZ_JS;
linebefore.Memo = Item.SOBKZ;
linebefore.Status = "2";
linebefore.INVCode = Item.MATNR.TrimStart('0');//转换前物料编码
linebefore.SOCode = "";

18
WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
View File

@ -1197,41 +1197,41 @@
<tr>
<th class="formTitle">料品编码</th>
<td class="formValue">
<input id="InvCode" name="InvCode" type="text" class="form-control " />
<input id="Enable" name="Enable" type="text" style="display:none" />
<input id="InvCode" name="InvCode" type="text" class="form-control " disabled="disabled" />
<input id="Enable" name="Enable" type="text" style="display:none" disabled="disabled" />
</td>
</tr>
<tr>
<th class="formTitle">物料描述</th>
<td class="formValue">
<input id="INVNAME" name="INVNAME" type="text" class="form-control " />
<input id="INVNAME" name="INVNAME" type="text" class="form-control " disabled="disabled" />
</td>
</tr>
<tr>
<th class="formTitle">规格型号</th>
<td class="formValue">
<input id="INVSTD" name="INVSTD" type="text" class="form-control " />
<input id="INVSTD" name="INVSTD" type="text" class="form-control " disabled="disabled" />
</td>
</tr>
<tr>
<th class="formTitle">计量单位</th>
<td class="formValue">
<input id="INVUOM" name="INVUOM" type="text" class="form-control " />
<input id="INVUOM" name="INVUOM" type="text" class="form-control " disabled="disabled" />
</td>
</tr>
<tr>
<th class="formTitle">数量</th>
<td class="formValue">
<input id="Quantity" name="Quantity" type="text" class="form-control " />
<input id="YAmount" name="YAmount" type="text" style="display:none" />
<input id="DJQuantity" name="DJQuantity" type="text" style="display:none" />
<input id="Quantity" name="Quantity" type="text" class="form-control " disabled="disabled" />
<input id="YAmount" name="YAmount" type="text" style="display:none" disabled="disabled" />
<input id="DJQuantity" name="DJQuantity" type="text" style="display:none" disabled="disabled" />
</td>
</tr>
<tr>
<th class="formTitle">已生成条码数量</th>
<td class="formValue">
<input id="CreatedQty" name="CreatedQty" type="text" class="form-control " />
<input id="CreatedQty" name="CreatedQty" type="text" class="form-control " disabled="disabled" />
</td>
</tr>
<tr>

Write Preview
Loading…
Cancel
Save