diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs index 4af1120..b25cdab 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs +++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs @@ -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 HeadInfoList = new List(); @@ -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 = ""; diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml index ebd9030..58d1ec9 100644 --- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml +++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml @@ -1197,41 +1197,41 @@ 料品编码 - - + + 物料描述 - + 规格型号 - + 计量单位 - + 数量 - - - + + + 已生成条码数量 - +