fix(物料管理): 修复批次号默认值问题并优化工单导入逻辑

修复QcScrapRecordsService和ReportFlowService中批次号默认值为"000"的问题,改为使用实际批次号
重构ProWorkorderImportService中的工单编号生成逻辑,改为按导入顺序生成而非按产品分组
完善IProWorkorderMaterialService接口定义,增加参数并调整方法位置
优化ProWorkorderMaterialService中的库存查询方法,增加过滤条件和参数
This commit is contained in:
2026-03-02 11:32:13 +08:00
parent b68a277d8e
commit dc8cb4053d
5 changed files with 290 additions and 260 deletions

View File

@@ -10,21 +10,21 @@ namespace DOAN.Service.MES.product.IService
public interface IProWorkorderMaterialService
{
/// <summary>
/// 根据工单号查询领料清单
/// 根据工单号查询领料清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>领料清单数据</returns>
List<MaterialTakeDto> GetMaterialTakeList(string workorder);
/// <summary>
/// 根据工单号查询成品入库清单
/// 根据工单号查询成品入库清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>成品入库清单数据</returns>
List<ProductStorageDto> GetProductStorageList(string workorder);
/// <summary>
/// 根据工单号查询出货清单
/// 根据工单号查询出货清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>出货清单数据</returns>
@@ -34,8 +34,35 @@ namespace DOAN.Service.MES.product.IService
/// 根据工单号查询物料库存接口
/// </summary>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <param name="searchType">查询范围 1-物料库 2-转用库</param>
/// <returns>物料库存信息列表</returns>
List<MaterialInventoryDto> GetMaterialInventoryList(string workorder);
List<MaterialInventoryDto> GetMaterialInventoryList(string workorder, bool isHideZero, int searchType);
/// <summary>
/// 根据工单号获取可领料工单清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <param name="searchType">查询范围 1-物料库 2-转用库</param>
/// <returns>可领料工单清单</returns>
List<ProWorkorderDto> GetPickableWorkordersByWorkorder(string workorder, bool isHideZero, int searchType);
/// <summary>
/// 根据工单号查询成品库存
/// </summary>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <returns>成品库存信息列表</returns>
List<MaterialInventoryDto> GetProductInventoryList(string workorder, bool isHideZero);
/// <summary>
/// 根据工单号获取可出货订单清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <returns>可出货订单清单</returns>
List<OrderPurchaseDto> GetShippableOrdersByWorkorder(string workorder, bool isHideZero);
/// <summary>
/// 根据工单领料
@@ -58,25 +85,6 @@ namespace DOAN.Service.MES.product.IService
/// <returns>操作结果</returns>
bool ShipProduct(ShipmentRequestDto request);
/// <summary>
/// 根据工单号获取可领料工单清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>可领料工单清单</returns>
List<ProWorkorderDto> GetPickableWorkordersByWorkorder(string workorder);
/// <summary>
/// 根据工单号获取可出货订单清单
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>可出货订单清单</returns>
List<OrderPurchaseDto> GetShippableOrdersByWorkorder(string workorder);
/// <summary>
/// 根据工单号查询成品库存
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>成品库存信息列表</returns>
List<MaterialInventoryDto> GetProductInventoryList(string workorder);
}
}