1.增加单灯出库查询物料接口

2.修改入库查询物料接口
3.货架出库单据计算物料重复问题修复
4.出库单据、盘点单据生成单据号修改为按 202406100001这种格式

WCS.BLL/Services/Service/OutstoreService.cs

@@ -505,20 +505,7 @@ namespace WCS.BLL.Services.Service
             try
             {
                 DbHelp.db.BeginTran();
-
-                ////第一步 删除、解锁 放在上一次结束入库时操作
-                //var outOrderMatDetails = DbHelp.db.Queryable<OutOrderMatDetail>()
-                //                                 .Where(t => t.OrderId == order.Id)
-                //                                 .ToList();
-                //var inventoryIds = outOrderMatDetails.Select(t => t.Id).ToList();
-                //var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
-                //                                 .Where(t => inventoryIds.Contains(t.Id))
-                //                                 .ToList();
-                //inventoryDetails.ForEach(t => { t.IsLocked = false; });
-                //DbHelp.db.Deleteable(outOrderMatDetails).ExecuteCommand();
-                //DbHelp.db.Updateable(inventoryDetails).ExecuteCommand();
-
-                //第一步 找到需求物料
+                //第一步 物料需求表
                 var outOrderDetails = DbHelp.db.Queryable<OutOrderDetail>()
                                                  .Where(t => t.OrderId == order.Id)
                                                  .ToList();
@@ -538,6 +525,7 @@ namespace WCS.BLL.Services.Service
                     var matInventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
                              .Where(t => t.MatCode == outOrderDetail.MatCode)
                              .WhereIF(!string.IsNullOrEmpty(outOrderDetail.MatBatch), t => t.MatBatch == outOrderDetail.MatBatch)
+                             .Where(t => t.IsLocked == false)//未锁定的物料
                              .OrderBy(t => t.MatBatch)//先进先出
                              .OrderBy(t => t.MatQty)//零散料先出
                              .ToList();