MES.Service/Dto/webApi/ErpOutWare.cs
@@ -4,7 +4,7 @@ { public decimal OutType { get; set; } public string OutType { get; set; } public string OutNo { get; set; } public DateTime? BillDate { get; set; } public string? CustNo { get; set; } MES.Service/Dto/webApi/ErpOutWareDetails.cs
@@ -4,7 +4,7 @@ { public decimal OrderType { get; set; } public string OrderType { get; set; } public string OrderNumber { get; set; } public string OrderNo { get; set; } public string? ItemNo { get; set; } @@ -13,13 +13,15 @@ public string? DepotCode { get; set; } public decimal? Quantity { get; set; } public decimal? OutQuantity { get; set; } public decimal OutType { get; set; } public string OutType { get; set; } public string OutNo { get; set; } public string OutOrder { get; set; } public string? Remarks { get; set; } public string? Type { get; set; } public decimal? ExpQuantity { get; set; } public decimal? ActQuantity { get; set; } public string? CustItemNo { get; set; } public string? CustItemName { get; set; } public string? CustItemModel { get; set; } public string? CustBillNo { get; set; } public string? MachineType { get; set; } MES.Service/Dto/webApi/ErpReturnWare.cs
@@ -4,7 +4,7 @@ { public decimal ReturnType { get; set; } public string ReturnType { get; set; } public string ReturnNo { get; set; } public string? CustNo { get; set; } public DateTime? BillDate { get; set; } MES.Service/Dto/webApi/ErpReturnWareDetails.cs
@@ -9,11 +9,14 @@ public decimal? Quantity { get; set; } public string? Type { get; set; } public string? DepotCode { get; set; } public decimal? ReturnType { get; set; } public string? ReturnType { get; set; } public string? ReturnNo { get; set; } public string? ReturnOrder { get; set; } public decimal OrderType { get; set; } public string OrderType { get; set; } public string OrderNumber { get; set; } public string OrderNo { get; set; } public decimal? ActQuantity { get; set; } public string? CustItemNo { get; set; } public string? CustItemName { get; set; } public string? CustItemModel { get; set; } } MES.Service/Modes/MesOutware.cs
@@ -19,7 +19,7 @@ /// 销售出货单别 ///</summary> [SugarColumn(ColumnName="OUTWARE_TYPE" )] public decimal? OutwareType { get; set; } public string? OutwareType { get; set; } /// <summary> /// 销售出货单号 ///</summary> MES.Service/Modes/MesOutwareDetails.cs
@@ -24,7 +24,7 @@ /// 订单单别 ///</summary> [SugarColumn(ColumnName="ORDER_TYPE" )] public decimal? OrderType { get; set; } public string? OrderType { get; set; } /// <summary> /// 订单序号 ///</summary> @@ -69,16 +69,22 @@ /// 出货单别 ///</summary> [SugarColumn(ColumnName="OUTWARE_TYPE" )] public decimal? OutwareType { get; set; } public string? OutwareType { get; set; } /// <summary> /// 出货单号 ///</summary> [SugarColumn(ColumnName="OUTWARE_NO" )] public string? OutwareNo { get; set; } /// <summary> /// 出货序号 ///</summary> [SugarColumn(ColumnName = "OUTWARE_ORDER")] public string? OutwareOrder { get; set; } /// <summary> /// 类型 ///</summary> [SugarColumn(ColumnName="TYPE" )] [SugarColumn(ColumnName="TYPE" )] public string? Type { get; set; } /// <summary> /// 备注 @@ -105,6 +111,12 @@ public string? CustItemNo { get; set; } /// <summary> /// 客户品名 ///</summary> [SugarColumn(ColumnName = "CUST_ITEM_NAME")] public string? CustItemName { get; set; } /// <summary> /// 客户规格 ///</summary> [SugarColumn(ColumnName = "CUST_ITEM_MODEL")] MES.Service/Modes/MesReturnware.cs
@@ -19,7 +19,7 @@ /// 销售退货单别 ///</summary> [SugarColumn(ColumnName="RETURN_TYPE" )] public decimal? ReturnType { get; set; } public string ReturnType { get; set; } /// <summary> /// 销售退货单号 ///</summary> MES.Service/Modes/MesReturnwareDetails.cs
@@ -54,7 +54,7 @@ /// 销售退货单别 ///</summary> [SugarColumn(ColumnName="RETURN_TYPE" )] public decimal? ReturnType { get; set; } public string? ReturnType { get; set; } /// <summary> /// 销售退货单号 ///</summary> @@ -69,7 +69,7 @@ /// 订单单别 ///</summary> [SugarColumn(ColumnName="ORDER_TYPE" )] public decimal? OrderType { get; set; } public string? OrderType { get; set; } /// <summary> /// 订单序号 ///</summary> @@ -80,5 +80,29 @@ ///</summary> [SugarColumn(ColumnName="ORDER_NO" )] public string OrderNo { get; set; } /// <summary> /// 赠品量 ///</summary> [SugarColumn(ColumnName = "ACTUAL_QUANTITY")] public decimal? ActualQuantity { get; set; } /// <summary> /// 客户品号 ///</summary> [SugarColumn(ColumnName = "CUST_ITEM_NO")] public string? CustItemNo { get; set; } /// <summary> /// 客户品名 ///</summary> [SugarColumn(ColumnName = "CUST_ITEM_NAME")] public string? CustItemName { get; set; } /// <summary> /// 客户规格 ///</summary> [SugarColumn(ColumnName = "CUST_ITEM_MODEL")] public string? CustItemModel { get; set; } } } MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/Warehouse/MesOutwareManager.cs
@@ -182,11 +182,13 @@ OutQuantity = dto.OutQuantity, OutwareType = dto.OutType, OutwareNo = dto.OutNo, OutwareOrder = dto.OutOrder, Type = dto.Type, Remarks = dto.Remarks, ExpectedQuantity = dto.ExpQuantity, ActualQuantity = dto.ActQuantity, CustItemNo = dto.CustItemNo, CustItemName = dto.CustItemName, CustItemModel = dto.CustItemModel, CustBillNo = dto.CustBillNo, MachineType = dto.MachineType @@ -208,14 +210,14 @@ return UseTransaction(db => { var update = db.Deleteable<Womcaa>() .Where(it => it.Caa001 == data.FBillNo && it.SrcBillType == data.FBillTypeID) var update = db.Deleteable<MesOutware>() .Where(it => it.OutwareNo == data.FBillNo && it.OutwareType == data.FBillTypeID) .ExecuteCommand() > 0; var insertOrUpdate = db.Deleteable<Womcab>() .Where(it => it.Cab001 == data.FBillNo && it.Cab002 == data.FBillTypeID) var insertOrUpdate = db.Deleteable<MesOutwareDetails>() .Where(it => it.OutwareNo == data.FBillNo && it.OutwareType == data.FBillTypeID) .ExecuteCommand() > 0;
@@ -166,7 +166,11 @@ ReturnOrder = dto.ReturnOrder, OrderType = dto.OrderType, OrderNumber = dto.OrderNumber, OrderNo = dto.OrderNo OrderNo = dto.OrderNo, ActualQuantity = dto.ActQuantity, CustItemNo = dto.CustItemNo, CustItemName = dto.CustItemName, CustItemModel = dto.CustItemModel }; @@ -185,14 +189,14 @@ return UseTransaction(db => { var update = db.Deleteable<Womcaa>() .Where(it => it.Caa001 == data.FBillNo && it.SrcBillType == data.FBillTypeID) var update = db.Deleteable<MesReturnware>() .Where(it => it.ReturnNo == data.FBillNo && it.ReturnType == data.FBillTypeID) .ExecuteCommand() > 0; var insertOrUpdate = db.Deleteable<Womcab>() .Where(it => it.Cab001 == data.FBillNo && it.Cab002 == data.FBillTypeID) var insertOrUpdate = db.Deleteable<MesReturnwareDetails>() .Where(it => it.ReturnNo == data.FBillNo && it.ReturnType == data.FBillTypeID) .ExecuteCommand() > 0;
@@ -124,7 +124,51 @@ } } [HttpPost("Delete")] public ResponseResult Delete(YFDelete data) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Delete"; entity.Method = METHOD; entity.PageName = data.FBillTypeID + "-" + data.FBillNo; //单别和单号的拼接 entity.Title = "销售出货通知单"; entity.Data = JsonConvert.SerializeObject(data); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.Delete(data); resultInfos.tbBillList = save; entity.Result = 0; if (save) entity.Result = 1; entity.DealWith = 1; _manager.save(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { entity.Result = 0; entity.DealWith = 0; entity.ResultData = ex.Message; _manager.save(entity); return ResponseResult.ResponseError(ex); } } /***进入模版管理可以修改模版***/
@@ -123,6 +123,52 @@ } [HttpPost("Delete")] public ResponseResult Delete(YFDelete data) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Delete"; entity.Method = METHOD; entity.PageName = data.FBillTypeID + "-" + data.FBillNo; //单别和单号的拼接 entity.Title = "销售退货通知单"; entity.Data = JsonConvert.SerializeObject(data); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.Delete(data); resultInfos.tbBillList = save; entity.Result = 0; if (save) entity.Result = 1; entity.DealWith = 1; _manager.save(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { entity.Result = 0; entity.DealWith = 0; entity.ResultData = ex.Message; _manager.save(entity); return ResponseResult.ResponseError(ex); } } /***进入模版管理可以修改模版***/ /// <summary> MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
