From 2c6c749d945b33829d67ecf820905099bc9c1eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=B9=8F?= Date: Mon, 26 Jun 2023 09:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=AF=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=85=A5=E5=BA=93=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICSManufactureService.cs | 37 +++++----- .../ICSSoft.Entity/MoStockInModel.cs | 70 +++++++++++-------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs index f0e2287..5f1cee0 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs @@ -991,31 +991,34 @@ ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10,a. log.Debug(sql); ds = DBHelper.SQlReturnDataSet(sql, cmd); - Inputstr = DataToJsonHelper.DataSetToJson(ds, "details", "Costre"); - resultStr = HTTPHelper.HttpPost(TransType, ERPUrl.ManufactureReceiveDocURL, Inputstr); + string ByProductInputstr = DataToJsonHelper.DataSetToJson(ds, "details", "Costre"); + string byProductResultStr = HTTPHelper.HttpPost(TransType, ERPUrl.ManufactureReceiveDocURL, ByProductInputstr); result = new Result(); - result = JsonConvert.DeserializeObject(resultStr); + result = JsonConvert.DeserializeObject(byProductResultStr); if (result.Success) { //向副产品生成入库单记录表中插入数据 + sql = @"SELECT a.TransCode,a.TransSequence,a.Quantity,c.BatchCode,b.InvCode,a.WorkPoint + FROM ICSWareHouseLotInfoLog a + LEFT JOIN ICSInventoryLot b ON b.LotNo=a.LotNo AND b.WorkPoint=a.WorkPoint + LEFT JOIN ICSExtension c ON c.ID=b.ExtensionID AND c.WorkPoint=a.WorkPoint + WHERE a.Identification='{0}'"; + DataTable dtt = DBHelper.SQlReturnData(sql, cmd); + Inputstr = dtt.ToString(); List moStockIns = JsonConvert.DeserializeObject>(Inputstr); foreach (MoStockInModel moStockIn in moStockIns) { - foreach (MoStockInDetail detail in moStockIn.details) + try { - try - { - sql = @"INSERT INTO ICSMOByProductLog VALUES(NEWID(),'{0}','{1}',{2},'{3}','{4}','{5}')"; - sql = string.Format(sql, moStockIn.MOCode, detail.Sequence, detail.Quantity, detail.BatchCode, detail.InvCode, moStockIn.WorkPoint); - log.Debug("向副产品生成入库单记录表中插入数据："); - log.Debug(sql); - DBHelper.ExecuteNonQuery(sql, cmd); - } - catch - { - throw new Exception(language.GetNameByCode("WMSAPIInfo466")); - } - + sql = @"INSERT INTO ICSMOByProductLog VALUES(NEWID(),'{0}','{1}',{2},'{3}','{4}','{5}')"; + sql = string.Format(sql, moStockIn.TransCode, moStockIn.TransSequence, moStockIn.Quantity, moStockIn.BatchCode, moStockIn.InvCode, moStockIn.WorkPoint); + log.Debug("向副产品生成入库单记录表中插入数据："); + log.Debug(sql); + DBHelper.ExecuteNonQuery(sql, cmd); + } + catch + { + throw new Exception(language.GetNameByCode("WMSAPIInfo466")); } } log.Debug(language.GetNameByCode("WMSAPIInfo465") + "：" + result.ToString()); diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/MoStockInModel.cs b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/MoStockInModel.cs index 61d0a78..fbe12e0 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.Entity/MoStockInModel.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.Entity/MoStockInModel.cs @@ -8,38 +8,46 @@ namespace ICSSoft.Entity { public class MoStockInModel { - public string Costre { get; set; } - public string WorkPoint { get; set; } - public string DepCode { get; set; } - public string WHCode { get; set; } - public string MOCode { get; set; } - public string User { get; set; } - public string MTime { get; set; } - public string UpdateTodoQuantity { get; set; } - public List details { get; set; } - } - - public class MoStockInDetail - { - public string Costre { get; set; } - public string Sequence { get; set; } - public string InvCode { get; set; } + public string TransCode { get; set; } + public string TransSequence { get; set; } public string Quantity { get; set; } - public string Amount { get; set; } - public string AmountMODetailID { get; set; } - public string ProjectCode { get; set; } public string BatchCode { get; set; } - public string Version { get; set; } - public string Brand { get; set; } - public string cFree1 { get; set; } - public string cFree2 { get; set; } - public string cFree3 { get; set; } - public string cFree4 { get; set; } - public string cFree5 { get; set; } - public string cFree6 { get; set; } - public string cFree7 { get; set; } - public string cFree8 { get; set; } - public string cFree9 { get; set; } - public string cFree10 { get; set; } + public string InvCode { get; set; } + public string WorkPoint { get; set; } + + + //public string Costre { get; set; } + //public string WorkPoint { get; set; } + //public string DepCode { get; set; } + //public string WHCode { get; set; } + //public string MOCode { get; set; } + //public string User { get; set; } + //public string MTime { get; set; } + //public string UpdateTodoQuantity { get; set; } + //public List details { get; set; } } + + //public class MoStockInDetail + //{ + // public string Costre { get; set; } + // public string Sequence { get; set; } + // public string InvCode { get; set; } + // public string Quantity { get; set; } + // public string Amount { get; set; } + // public string AmountMODetailID { get; set; } + // public string ProjectCode { get; set; } + // public string BatchCode { get; set; } + // public string Version { get; set; } + // public string Brand { get; set; } + // public string cFree1 { get; set; } + // public string cFree2 { get; set; } + // public string cFree3 { get; set; } + // public string cFree4 { get; set; } + // public string cFree5 { get; set; } + // public string cFree6 { get; set; } + // public string cFree7 { get; set; } + // public string cFree8 { get; set; } + // public string cFree9 { get; set; } + // public string cFree10 { get; set; } + //} }