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

Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

Browse Source 
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
This commit is contained in:
赵正易
2024-03-19 20:49:02 +08:00
parent c6093a01ac a3d7b47a88
commit be26bfedce
42 changed files with 2489 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ZR.Service/mes/wms/IService/IWMExitwarehouseService.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Service.mes.wms.IService
{
public interface IWMExitwarehouseService
{
/// <summary>
/// 一般退库
/// </summary>
/// <param name="original"></param>
/// <returns></returns>
public bool ExitwarehouseCommmon(string original);
/// <summary>
/// 判断箱子是否存在陈平库中
/// </summary>
/// <param name="originalCode"></param>
/// <returns></returns>
public bool IsExistedWarehouse(string originalCode);
}
}

22
ZR.Service/mes/wms/IService/IWMWarehousingService.cs
View File

@@ -1,22 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.qc.DTO;
using ZR.Model.MES.wms;
namespace ZR.Service.mes.wms.IService
{
public interface IWMentryWarehousing_productService
{
// 获取库位列表
public bool IsProductionLoacation(string production_location_code);
}
}

41
ZR.Service/mes/wms/IService/IWMentryWarehousing_productService.cs Normal file
View File

@@ -0,0 +1,41 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.qc.DTO;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using static Org.BouncyCastle.Crypto.Engines.SM2Engine;
namespace ZR.Service.mes.wms.IService
{
public interface IWMentryWarehousing_productService
{
// 获取库位列表
public bool IsProductionLoacation(string production_location_code);
// 判断是否为成品箱子码
public int isProductionPackage(string production_packcode);
//判断箱子是否满
public bool isFullPackage(string production_packcode);
// 货物入库
public int IntoProductwarehouse(WmgoodsDto wmgoods, string createName);
//获取库位已经存在的货物
public List<WmGoodsNowProduction> Getpackagelist(string location);
//解析外箱标签码
public ResultionPackageCodeDto ResolutionPackage(string code);
public bool IsExistedWarehouse(string originalCode);
}
}

4
ZR.Service/mes/wms/IService/IWMlocationInfoService.cs
View File

@@ -15,7 +15,7 @@ namespace ZR.Service.mes.wms.IService
// 获取成品库信息
public (List<WmInfo>,int) Getwminfo_product(string shelf , int layer, int pageNum , int pageSize);
// 获取库位信息
public WmInfo Getlocationinfo(int warehouse_num, string locationcode);
}
}

25
ZR.Service/mes/wms/IService/IWmCustomService.cs Normal file
View File

@@ -0,0 +1,25 @@
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 IWmCustomService : IBaseService<WmCustom>
{
PagedInfo<WmCustomDto> GetList(WmCustomQueryDto parm);
WmCustom GetInfo(int Id);
WmCustom AddWmCustom(WmCustom parm);
int UpdateWmCustom(WmCustom parm);
}
}

24
ZR.Service/mes/wms/IService/IWmMaterialService.cs Normal file
View File

@@ -0,0 +1,24 @@
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 IWmMaterialService : IBaseService<WmMaterial>
{
PagedInfo<WmMaterialDto> GetList(WmMaterialQueryDto parm);
WmMaterial GetInfo(string Id);
WmMaterial AddWmMaterial(WmMaterial parm);
int UpdateWmMaterial(WmMaterial parm);
}
}

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);
}
}