Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库模块_出库:修正

Browse Source
This commit is contained in:
qianhao.xu
2024-03-19 11:08:28 +08:00
parent 741ec8ade4
commit bf4e606977
15 changed files with 641 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Infrastructure/CustomException/ResultCode.cs
View File

@@ -7,7 +7,7 @@ namespace Infrastructure
[Description("success")] [Description("success")]
SUCCESS = 200, SUCCESS = 200,
[Description("没有更多数据")] [Description("传入参数为空")]
NO_DATA = 210, NO_DATA = 210,
[Description("参数错误")] [Description("参数错误")]

6
ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs
View File

@@ -53,8 +53,8 @@ namespace ZR.Admin.WebApi.Controllers
{ {
var response = _WmMaterialService.GetInfo(Id); var response = _WmMaterialService.GetInfo(Id);
var info = response.Adapt<WmMaterial>();
return SUCCESS(info); return SUCCESS(response);
} }
/// <summary> /// <summary>
@@ -101,7 +101,7 @@ namespace ZR.Admin.WebApi.Controllers
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmMaterialService.Delete(idsArr); var response = _WmMaterialService.Delete(idsArr);
return ToResponse(response); return ToResponse(response);
} }

141
ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs Normal file
View File

@@ -0,0 +1,141 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
using ZR.Model.MES.wms;
using ZR.Service.mes.wms;
//创建时间：2024-03-18
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 出货单（物料+客户）
/// </summary>
[Verify]
[Route("mes/wm/WmOutOrder")]
public class WmOutOrderController : BaseController
{
/// <summary>
/// 出货单（物料+客户）接口
/// </summary>
private readonly IWmOutOrderService _WmOutOrderService;
public WmOutOrderController(IWmOutOrderService WmOutOrderService)
{
_WmOutOrderService = WmOutOrderService;
}
/// <summary>
/// 查询出货单（物料+客户）列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmoutorder:list")]
public IActionResult QueryWmOutOrder([FromQuery] WmOutOrderQueryDto parm)
{
var response = _WmOutOrderService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询出货单（物料+客户）详情
/// </summary>
/// <param name="ShipmentNum"></param>
/// <returns></returns>
[HttpGet("{ShipmentNum}")]
[ActionPermissionFilter(Permission = "business:wmoutorder:query")]
public IActionResult GetWmOutOrder(string ShipmentNum)
{
var response = _WmOutOrderService.GetInfo(ShipmentNum);
return SUCCESS(response);
}
/// <summary>
/// 添加出货单（物料+客户）
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmoutorder:add")]
[Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmOutOrder([FromBody] WmOutOrder_materialDto parm)
{
if(parm == null)
{
return SUCCESS(null);
}
var modal = parm.ToCreate(HttpContext);
var response = _WmOutOrderService.AddWmOutOrder(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新出货单（物料+客户）
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmoutorder:edit")]
[Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmOutOrder([FromBody] WmOutOrderDto parm)
{
var modal = parm.Adapt<WmOutOrder>().ToUpdate(HttpContext);
var response = _WmOutOrderService.UpdateWmOutOrder(modal);
return ToResponse(response);
}
/// <summary>
/// 删除出货单（物料+客户）
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmoutorder:delete")]
[Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmOutOrder(string ids)
{
if (string.IsNullOrEmpty(ids)) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmOutOrderService.Delete(ids.Split(","));
return ToResponse(response);
}
/// <summary>
/// 获取客户信息
/// </summary>
/// <returns></returns>
[HttpGet("getcustom_list")]
public IActionResult GetWmOutOrder()
{
List<WmCustom> customs= _WmOutOrderService.GetCustominfo();
return SUCCESS(customs);
}
/// <summary>
/// 查询物料记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("getmaterial_list")]
public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm)
{
var response = _WmOutOrderService.GetmaterialList(parm);
return SUCCESS(response);
}
}
}

1
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@@ -48,6 +48,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Properties\PublishProfiles\" /> <Folder Include="Properties\PublishProfiles\" />
<Folder Include="wwwroot\export\" /> <Folder Include="wwwroot\export\" />
<Folder Include="wwwroot\Generatecode\" />
<Folder Include="wwwroot\workorder\" /> <Folder Include="wwwroot\workorder\" />
<Folder Include="wwwroot\workplan\" /> <Folder Include="wwwroot\workplan\" />
</ItemGroup> </ItemGroup>

2
ZR.Admin.WebApi/appsettings.development.json
View File

@@ -11,7 +11,7 @@
{ {
//外网连接服务器 //外网连接服务器
"Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//外网连接服务器 //外网连接服务器
//"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-客户信息-0317153123.zip
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-物料记录表-0316162215.zip
View File

Binary file not shown.

35
ZR.Model/MES/wms/Dto/WmMaterialDto.cs
View File

@@ -48,6 +48,38 @@ namespace ZR.Model.MES.wms.Dto
public DateTime? UpdatedTime { get; set; } public DateTime? UpdatedTime { get; set; }
} }
/// <summary>
/// 带库存记录的物料库存表
/// </summary>
public class WmMaterialQuery_stockQuantityDto : WmMaterialQueryDto
{
/// <summary>
/// 库存数量
/// </summary>
public int stockQuantity { get; set; }
/// <summary>
/// 需要出货数量
/// </summary>
public int requireOutNum { get; set; }
}
/// <summary>
/// 带需要出货数量的物料库存表
/// </summary>
public class WmMaterialQuery_stockQuantityDto2 : WmMaterialQueryDto
{
/// <summary>
/// 需要出货数量
/// </summary>
public int requireOutNum { get; set; }
}
/// <summary> /// <summary>
/// 物料记录表输入输出对象 /// 物料记录表输入输出对象
/// </summary> /// </summary>
@@ -95,4 +127,7 @@ namespace ZR.Model.MES.wms.Dto
} }
} }

71
ZR.Model/MES/wms/Dto/WmOutOrderDto.cs Normal file
View File

@@ -0,0 +1,71 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 出货单（物料+客户）查询对象
/// </summary>
public class WmOutOrderQueryDto : PagerInfo
{
}
/// <summary>
/// 出货单（物料+客户）输入输出对象
/// </summary>
public class WmOutOrderDto
{
public string ShipmentNum { get; set; }
public string CustomId { get; set; }
public string CustomNo { get; set; }
public string CustomName { get; set; }
public string CustomAddress { get; set; }
public string Remarks { get; set; }
public int Type { get; set; }
public int? Status { get; set; }
public int? Year { get; set; }
public int? Week { get; set; }
public int? Date { get; set; }
public string CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; }
public string UpdatedBy { get; set; }
public DateTime? UpdatedTime { get; set; }
}
/// <summary>
/// 出货单（物料+客户）输入输出对象
/// </summary>
public class WmOutOrder_materialDto : WmOutOrderDto
{
//带出货数量的物料表
public List<WmMaterialQuery_stockQuantityDto> MaterialList { get; set; }
}
/// <summary>
/// 出货单_物料——数量
/// </summary>
public class WmOutOrder_material_num : WmOutOrderDto
{
//带出货数量的物料表
public List<WmMaterialQuery_stockQuantityDto2> MaterialList { get; set; }
}
}

9
ZR.Model/MES/wms/WmGoodsNowProduction.cs
View File

@@ -27,12 +27,19 @@ namespace ZR.Model.MES.wms
public string PackageCodeClient { get; set; } public string PackageCodeClient { get; set; }
/// <summary> /// <summary>
/// 箱子编号 (批次号) /// 箱子编号 (原始)
///</summary> ///</summary>
[SugarColumn(ColumnName = "package_code_original")] [SugarColumn(ColumnName = "package_code_original")]
public string PackageCodeOriginal { get; set; } public string PackageCodeOriginal { get; set; }
/// <summary>
/// 零件号
///</summary>
[SugarColumn(ColumnName = "partnumber")]
public string Partnumber { get; set; }
/// <summary> /// <summary>
/// 库位编号 /// 库位编号
///</summary> ///</summary>

59
ZR.Model/MES/wms/WmMaterialOutorder.cs Normal file
View File

@@ -0,0 +1,59 @@
namespace ZR.Model.MES.wms
{
/// <summary>
/// 物料表和出库单关联表
/// </summary>
[SugarTable("wm_material_outorder")]
public class WmMaterialOutorder
{
/// <summary>
/// Id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 物料表主键
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_material_id")]
public string FkMaterialId { get; set; }
/// <summary>
/// 出货单id
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_outorder_id")]
public string FkOutorderId { get; set; }
/// <summary>
/// 出货数量
/// </summary>
[SugarColumn(ColumnName = "outhouse_num")]
public int OuthouseNum { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime? CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
}
}

161
ZR.Model/MES/wms/WmOutOrder.cs
View File

@@ -1,129 +1,100 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace ZR.Model.MES.wms namespace ZR.Model.MES.wms
{ {
/// <summary> /// <summary>
/// 出货单（物料+客户） /// 出货单（物料+客户）
///</summary> /// </summary>
[SugarTable("wm_out_order")] [SugarTable("wm_out_order")]
public class WmOutOrder public class WmOutOrder
{ {
//[Navigate(NavigateType.OneToMany, nameof(WmMaterialOutorder.FkOutorderId))]//BookA表中的studenId
//public List<WmMaterialOutorder> Books { get; set; }//注意禁止给books手动赋值
/// <summary> /// <summary>
/// 主键G /// 出库单号(EG+时间)
///</summary> /// </summary>
[SugarColumn(ColumnName="id" ,IsPrimaryKey = true )] [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "shipment_num")]
public string Id { get; set; } public string ShipmentNum { get; set; }
/// <summary>
/// 出货单号(雪花算法)
///</summary>
[SugarColumn(ColumnName="shipment_num" )]
public string ShipmentNum { get; set; }
/// <summary> /// <summary>
/// 客户id /// 客户id
///</summary> /// </summary>
[SugarColumn(ColumnName="custom_id" )] [SugarColumn(ColumnName = "custom_id")]
public string CustomId { get; set; } public string CustomId { get; set; }
/// <summary> /// <summary>
/// 客户代码 /// 客户代码
///</summary> /// </summary>
[SugarColumn(ColumnName="custom_no" )] [SugarColumn(ColumnName = "custom_no")]
public string CustomNo { get; set; } public string CustomNo { get; set; }
/// <summary> /// <summary>
/// 客户名称 /// 客户名称
///</summary> /// </summary>
[SugarColumn(ColumnName="custom_name" )] [SugarColumn(ColumnName = "custom_name")]
public string CustomName { get; set; } public string CustomName { get; set; }
/// <summary> /// <summary>
/// 客户地址 /// 客户地址
///</summary> /// </summary>
[SugarColumn(ColumnName="custom_address" )] [SugarColumn(ColumnName = "custom_address")]
public string CustomAddress { get; set; } public string CustomAddress { get; set; }
/// <summary>
/// 物料号（零件号）
///</summary>
[SugarColumn(ColumnName="partnumber" )]
public string Partnumber { get; set; }
/// <summary>
/// 单位
///</summary>
[SugarColumn(ColumnName="unit" )]
public string Unit { get; set; }
/// <summary>
/// 产品描述（产品名称）
///</summary>
[SugarColumn(ColumnName="product_name" )]
public string ProductName { get; set; }
/// <summary>
/// 产品颜色
///</summary>
[SugarColumn(ColumnName="color" )]
public string Color { get; set; }
/// <summary>
/// 规格（左右脚）
///</summary>
[SugarColumn(ColumnName="specification" )]
public string Specification { get; set; }
/// <summary>
/// 显示描述(产品描述+颜色+规格)
///</summary>
[SugarColumn(ColumnName="description" )]
public string Description { get; set; }
/// <summary>
/// 版本号
///</summary>
[SugarColumn(ColumnName="version" )]
public string Version { get; set; }
/// <summary> /// <summary>
/// 备注 /// 备注
///</summary> /// </summary>
[SugarColumn(ColumnName="remarks" )] public string Remarks { get; set; }
public string Remarks { get; set; }
/// <summary> /// <summary>
/// 状态（0-不可见 1-可见） /// 出库单状态（1-出库中 2-出库完成 3-弃用）
///</summary> /// </summary>
[SugarColumn(ColumnName="status" )] public int Type { get; set; }
public int? Status { get; set; }
/// <summary>
/// 状态（0-停用 1-启用）
/// </summary>
public int? Status { get; set; }
/// <summary> /// <summary>
/// 年 /// 年
///</summary> /// </summary>
[SugarColumn(ColumnName="year" )] public int? Year { get; set; }
public int? Year { get; set; }
/// <summary> /// <summary>
/// 周 /// 周
///</summary> /// </summary>
[SugarColumn(ColumnName="week" )] public int? Week { get; set; }
public int? Week { get; set; }
/// <summary> /// <summary>
/// 日 /// 日
///</summary> /// </summary>
[SugarColumn(ColumnName="date" )] public int? Date { get; set; }
public int? Date { get; set; }
/// <summary>
/// 要货数量
///</summary>
[SugarColumn(ColumnName="number" )]
public int? Number { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
///</summary> /// </summary>
[SugarColumn(ColumnName="CREATED_BY" )] [SugarColumn(ColumnName = "cREATED_BY")]
public string CreatedBy { get; set; } public string CreatedBy { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
///</summary> /// </summary>
[SugarColumn(ColumnName="CREATED_TIME" )] [SugarColumn(ColumnName = "cREATED_TIME")]
public DateTime? CreatedTime { get; set; } public DateTime? CreatedTime { get; set; }
/// <summary> /// <summary>
/// 更新人 /// 更新人
///</summary> /// </summary>
[SugarColumn(ColumnName="UPDATED_BY" )] [SugarColumn(ColumnName = "uPDATED_BY")]
public string UpdatedBy { get; set; } public string UpdatedBy { get; set; }
/// <summary> /// <summary>
/// 更新时间 /// 更新时间
///</summary> /// </summary>
[SugarColumn(ColumnName="UPDATED_TIME" )] [SugarColumn(ColumnName = "uPDATED_TIME")]
public DateTime? UpdatedTime { get; set; } public DateTime? UpdatedTime { get; set; }
} }
} }

30
ZR.Service/mes/wms/IService/IWmOutOrderService.cs Normal file
View File

@@ -0,0 +1,30 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using System.Collections.Generic;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
namespace ZR.Service.mes.wms.IService
{
/// <summary>
/// 出货单（物料+客户）service接口
/// </summary>
public interface IWmOutOrderService : IBaseService<WmOutOrder>
{
PagedInfo<WmOutOrderDto> GetList(WmOutOrderQueryDto parm);
WmOutOrder_material_num GetInfo(string ShipmentNum);
WmOutOrder AddWmOutOrder(WmOutOrder_materialDto parm);
int UpdateWmOutOrder(WmOutOrder parm);
List<WmCustom> GetCustominfo();
(List<WmMaterialQuery_stockQuantityDto>, int) GetmaterialList(WmMaterialQueryDto parm);
}
}

1
ZR.Service/mes/wms/WMentryWarehousing_productService.cs
View File

@@ -54,6 +54,7 @@ namespace ZR.Service.mes.wms
wmGood.PackageCode = Getpack_no(resultionPackage.WorkoderID, flow_num.ToString("000")); wmGood.PackageCode = Getpack_no(resultionPackage.WorkoderID, flow_num.ToString("000"));
wmGood.PackageCodeClient = resultionPackage.PatchCode; wmGood.PackageCodeClient = resultionPackage.PatchCode;
wmGood.Partnumber = resultionPackage.PartNumner;
wmGood.PackageCodeOriginal = resultionPackage.originalCode; wmGood.PackageCodeOriginal = resultionPackage.originalCode;
wmGood.LocationCode = wmgoods.location; wmGood.LocationCode = wmgoods.location;

224
ZR.Service/mes/wms/WmOutOrderService.cs Normal file
View File

@@ -0,0 +1,224 @@
using System;
using SqlSugar;
using Infrastructure.Attribute;
using ZR.Model;
using ZR.Repository;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using Mapster;
using System.Collections.Generic;
namespace ZR.Service.mes.wms
{
/// <summary>
/// 出货单（物料+客户）Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IWmOutOrderService), ServiceLifetime = LifeTime.Transient)]
public class WmOutOrderService : BaseService<WmOutOrder>, IWmOutOrderService
{
/// <summary>
/// 查询出货单（物料+客户）列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<WmOutOrderDto> GetList(WmOutOrderQueryDto parm)
{
var predicate = Expressionable.Create<WmOutOrder>();
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage<WmOutOrder, WmOutOrderDto>(parm);
return response;
}
/// <summary>
/// 获取详情
/// </summary>
/// <param name="ShipmentNum"></param>
/// <returns></returns>
public WmOutOrder_material_num GetInfo(string ShipmentNum)
{
WmOutOrder WmOutOrderList = Context.Queryable<WmOutOrder>()
.Where(it => it.ShipmentNum == ShipmentNum)
.First();
WmOutOrder_material_num wmOutOrderItem = null;
if (WmOutOrderList != null)
{
wmOutOrderItem = WmOutOrderList.Adapt<WmOutOrder_material_num>();
List<WmMaterialOutorder> moList = Context.Queryable<WmMaterialOutorder>()
.Where(it => it.FkOutorderId == WmOutOrderList.ShipmentNum)
.ToList();
if (moList != null && moList.Count > 0)
{
List<WmMaterialQuery_stockQuantityDto2> Material_stock = new List<WmMaterialQuery_stockQuantityDto2>();
foreach (var moItem in moList)
{
WmMaterial material = Context.Queryable<WmMaterial>().Where(it => it.Id == moItem.FkMaterialId).First();
WmMaterialQuery_stockQuantityDto2 dto2 = material.Adapt<WmMaterialQuery_stockQuantityDto2>();
dto2.requireOutNum = moItem.OuthouseNum;
Material_stock.Add(dto2);
}
wmOutOrderItem.MaterialList = Material_stock;
}
}
return wmOutOrderItem;
}
/// <summary>
/// 添加出货单（物料+客户）
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public WmOutOrder AddWmOutOrder(WmOutOrder_materialDto model)
{
string today_id = "EG" + DateTime.Now.ToString("yyMMdd");
string last_outorder_ShipmentNum = Context.Queryable<WmOutOrder>().Where(it => it.ShipmentNum.StartsWith(today_id)).Max(it => it.ShipmentNum);
if (string.IsNullOrEmpty(last_outorder_ShipmentNum))
{
model.ShipmentNum = today_id + "001";
}
else
{
int flow = int.Parse(last_outorder_ShipmentNum.Substring(last_outorder_ShipmentNum.Length - 3, 3)) + 1;
model.ShipmentNum = today_id + flow.ToString("000");
}
WmOutOrder wmOutOrder = model.Adapt<WmOutOrder>();
// 关联表也要新增
if (model.MaterialList != null)
{
if (model.MaterialList.Count > 0)
{
List<WmMaterialOutorder> materialOutorderList = new List<WmMaterialOutorder>();
foreach (var item in model.MaterialList)
{
WmMaterialOutorder materialOutorder = new WmMaterialOutorder();
materialOutorder.FkMaterialId = item.Id;
materialOutorder.FkOutorderId = model.ShipmentNum;
materialOutorder.OuthouseNum = item.requireOutNum;
materialOutorder.CreatedBy = model.CreatedBy;
materialOutorder.CreatedTime = DateTime.Now;
materialOutorderList.Add(materialOutorder);
};
int result = Context.Insertable(materialOutorderList).ExecuteCommand();
}
}
return Context.Insertable(wmOutOrder).ExecuteReturnEntity();
}
/// <summary>
/// 修改出货单（物料+客户）
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int UpdateWmOutOrder(WmOutOrder model)
{
//var response = Update(w => w.ShipmentNum == model.ShipmentNum, it => new WmOutOrder()
//{
// CustomNo = model.CustomNo,
// CustomName = model.CustomName,
// CustomAddress = model.CustomAddress,
// Remarks = model.Remarks,
// Type = model.Type,
// Status = model.Status,
// Year = model.Year,
// Week = model.Week,
// Date = model.Date,
// CreatedBy = model.CreatedBy,
// CreatedTime = model.CreatedTime,
// UpdatedBy = model.UpdatedBy,
// UpdatedTime = model.UpdatedTime,
//});
//return response;
return Update(model, true);
}
/// <summary>
/// 获取用户信息
/// </summary>
/// <returns></returns>
public List<WmCustom> GetCustominfo()
{
return Context.Queryable<WmCustom>().ToList();
}
/// <summary>
/// 查询物料记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public (List<WmMaterialQuery_stockQuantityDto>, int) GetmaterialList(WmMaterialQueryDto parm)
{
int total = 0;
var predicate = Expressionable.Create<WmMaterial>()
.AndIF(parm.Partnumber != null, it => it.Partnumber.Contains(parm.Partnumber))
.AndIF(parm.U8InventoryCode != null, it => it.U8InventoryCode.Contains(parm.U8InventoryCode))
.AndIF(parm.ProductName != null, it => it.ProductName.Contains(parm.ProductName))
.AndIF(parm.Color != null, it => it.Color.Contains(parm.Color))
.AndIF(parm.Specification != null, it => it.Specification.Contains(parm.Specification))
.AndIF(parm.Description != null, it => it.Description.Contains(parm.Description))
.AndIF(parm.Search1 != null, it => it.Search1.Contains(parm.Search1) || it.Search2.Contains(parm.Search1))
.AndIF(parm.Status > -1, it => it.Status == parm.Status);
List<WmMaterial> materialList = Context.Queryable<WmMaterial>()
.Where(predicate.ToExpression()).OrderByDescending(it => it.CreatedTime)
.ToPageList(parm.PageNum, parm.PageSize, ref total);
List<WmMaterialQuery_stockQuantityDto> material_stockQuantity_list = new List<WmMaterialQuery_stockQuantityDto>();
if (materialList.Count > 0)
{
foreach (WmMaterial item in materialList)
{
WmMaterialQuery_stockQuantityDto wmMaterialQuery_Stock_item = item.Adapt<WmMaterialQuery_stockQuantityDto>();
int material_num = 0;
List<WmGoodsNowProduction> productioList = Context
.Queryable<WmGoodsNowProduction>()
.Where(it => it.Partnumber == item.Partnumber)
.ToList();
if (productioList.Count > 0)
{
foreach (var product in productioList)
{
material_num = material_num + (int)product.GoodsNumLogic;
}
}
wmMaterialQuery_Stock_item.stockQuantity = material_num;
material_stockQuantity_list.Add(wmMaterialQuery_Stock_item);
}
}
return (material_stockQuantity_list, total);
}
}
}