From 7b84eb64d11b12b6fb41ae7f7085452512ad5d3f Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 20 六月 2025 08:18:08 +0800
Subject: [PATCH] 1.采购入库优化
---
service/Warehouse/MesCgthSqManager.cs | 109 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 13 deletions(-)
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index 3c77c8c..169d43d 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,43 @@
{
return Db.Queryable<MesCgthSq>()
.Where(s => s.Status == true)
+ .OrderByDescending(s => s.CreateDate)
.ToList();
}
- public OutItemDto GetSumItem(WarehouseQuery query)
+ public ProductionPickDto GetSumItem(WarehouseQuery query)
{
- var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo);
- if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦�");
+ if (string.IsNullOrEmpty(query.billNo)) throw new Exception("鐢宠鍗曞彿涓虹┖");
- var dto = new OutItemDto();
- dto.SumItem = GetItems(query);
+ var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo && it.Status == true);
+ if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨鏈鏍�");
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(a => a.ItemBarcode == query.barcode).Single();
+ 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);
- if (mesInvItemStocks == null) return dto;
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
- var mesItems = Db.Queryable<MesItems>()
- .Where(s => s.Id == mesInvItemStocks.ItemId).Single();
+ if(womdabs.Count < 1)
+ {
+ throw new Exception("璇ラ噰璐��璐х敵璇峰崟鏄庣粏涓嶅瓨鍦�");
+ }
- dto.ItemNo = mesItems.ItemNo;
- dto.Quantity = mesInvItemStocks.Quantity;
+
+ var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+
+ 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;
}
@@ -126,7 +143,73 @@
daa001 = query.daa001,
barcodeNum = barcodeNum,
splitNum = splitNum,
- barcode = query.barcode
+ barcode = query.barcode,
+ result = result.ToString()
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+
+ public ProductionPickDto ScanCodeCF(WarehouseQuery query)
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
+
+ var _strMsg = "";
+ var _intSum = "";
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_pda_CGTH_CF]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 2000),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@outCfBar", SqlDbType.NVarChar, 300),
+ new("@c_User", query.userName),
+ new("@p_biLL_no", query.daa001),
+ new("@p_item_barcode", query.barcode),
+ new("@num", query.Num)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+ _cfBar = parameters[2].Value.ToString();
+
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.daa001,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
--
Gitblit v1.9.3