From ce9702d2e5699c4c9acbed52da1fb6052ec68c6c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 16:45:39 +0800
Subject: [PATCH] 1.生产补料优化 2.登录图标查询优化 3.采购退货优化
---
service/Warehouse/MesCgthSqManager.cs | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index 3c77c8c..d4634cf 100644
--- a/service/Warehouse/MesCgthSqManager.cs
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -4,6 +4,7 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using SqlSugar;
namespace NewPdaSqlServer.service.Warehouse;
@@ -14,27 +15,38 @@
{
return Db.Queryable<MesCgthSq>()
.Where(s => s.Status == true)
+ .OrderByDescending(s => s.CreateDate)
.ToList();
}
- public OutItemDto GetSumItem(WarehouseQuery query)
+ public ProductionPickDto GetSumItem(WarehouseQuery query)
{
+ if (string.IsNullOrEmpty(query.billNo)) throw new Exception("鐢宠鍗曞彿涓虹┖");
+
var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo);
if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦�");
- var dto = new OutItemDto();
- dto.SumItem = GetItems(query);
+ var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.SQ_NUM FQty,A.YS_NUM SQty,A.SQ_NUM - A.YS_NUM DSQty,
+ dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID) as RecoKw
+fROM MES_CGTH_SQ_DETAIL A
+ LEFT JOIN MES_CGTH_SQ B ON A.MID = B.ID
+ LEFT JOIN MES_ITEMS C ON A.ITEM_ID = C.item_id
+WHERE B.BILL_NO = '{0}'", query.billNo);
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(a => a.ItemBarcode == query.barcode).Single();
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
- if (mesInvItemStocks == null) return dto;
- var mesItems = Db.Queryable<MesItems>()
- .Where(s => s.Id == mesInvItemStocks.ItemId).Single();
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
- dto.ItemNo = mesItems.ItemNo;
- dto.Quantity = mesInvItemStocks.Quantity;
+ var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
+
+ var dto = new ProductionPickDto
+ {
+ //daa001 = womdaa.Daa001,
+ //PlanNo = womcaa.Caa020,
+ items = DS_list,
+ Ysitems = YS_list
+ };
return dto;
}
--
Gitblit v1.9.3