From facc938ef010954584569fd725869869b49f4919 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期二, 26 八月 2025 10:56:15 +0800
Subject: [PATCH] 1、采购退货
---
service/Warehouse/MesCgthSqManager.cs | 62 ++++++++++++++++++++++---------
service/base/LoginService.cs | 2
2 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index 169d43d..782b894 100644
--- a/service/Warehouse/MesCgthSqManager.cs
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -14,48 +14,72 @@
public List<MesCgthSq> GetMesCgthSq()
{
return Db.Queryable<MesCgthSq>()
- .Where(s => s.Status == true)
+ // .Where(s => s.Status == true)
+ .Where(s => s.Status == false)
.OrderByDescending(s => s.CreateDate)
.ToList();
}
public ProductionPickDto GetSumItem(WarehouseQuery query)
{
- if (string.IsNullOrEmpty(query.billNo)) throw new Exception("鐢宠鍗曞彿涓虹┖");
+ // 楠岃瘉鐢宠鍗曞彿鏄惁涓虹┖
+ if (string.IsNullOrEmpty(query.billNo))
+ throw new Exception("鐢宠鍗曞彿涓虹┖");
- var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo && it.Status == true);
- if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨鏈鏍�");
+ // 娉ㄩ噴锛氬師鏌ヨ閫昏緫锛堝凡瀹℃牳鐘舵�侊級
+ // var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo && it.Status == true);
+ // if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨鏈鏍�");
- 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 mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo && it.Status == false);
+ if (mesInvItemOuts == null)
+ throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨宸插鏍�");
+ // 鏋勫缓鏌ヨ鏄庣粏鏁版嵁鐨凷QL璇彞
+ var sql = string.Format(@"
+ SELECT
+ c.item_no ItemNo,
+ c.item_name ItemName,
+ c.item_model ItemModel,
+ ISNULL(A.SQ_NUM, 0) FQty,
+ ISNULL(A.YS_NUM, 0) SQty,
+ ISNULL(A.SQ_NUM, 0) - ISNULL(A.YS_NUM, 0) 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);
+
+ // 鎵цSQL鏌ヨ鑾峰彇鏄庣粏鍒楄〃
var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
- if(womdabs.Count < 1)
+ // 楠岃瘉鏄庣粏鏁版嵁鏄惁瀛樺湪
+ if (womdabs.Count < 1)
{
throw new Exception("璇ラ噰璐��璐х敵璇峰崟鏄庣粏涓嶅瓨鍦�");
}
-
+ // 绛涢�夊緟澶勭悊鏄庣粏锛圖SQty > 0锛�
var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
+ // 绛涢�夊凡澶勭悊鏄庣粏锛圫Qty > 0锛�
var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
+ // 鏋勫缓骞惰繑鍥濪TO瀵硅薄
var dto = new ProductionPickDto
{
- //daa001 = womdaa.Daa001,
- //PlanNo = womcaa.Caa020,
+ // 娉ㄩ噴锛氬師璁″垝鍙风浉鍏虫槧灏勶紙褰撳墠鏈娇鐢級
+ // daa001 = womdaa.Daa001,
+ // PlanNo = womcaa.Caa020,
+
items = DS_list,
Ysitems = YS_list
};
return dto;
}
-
public List<MesCgthSqDetail> GetItems(WarehouseQuery query)
{
// 灏濊瘯灏唓uery.id杞崲涓篏uid绫诲瀷锛屽鏋滆浆鎹㈠け璐ワ紝鍒欐姏鍑哄紓甯�
@@ -165,10 +189,11 @@
public ProductionPickDto ScanCodeCF(WarehouseQuery query)
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.daa001.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");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
var _strMsg = "";
var _intSum = "";
@@ -187,7 +212,8 @@
new("@outSum", SqlDbType.NVarChar, 300),
new("@outCfBar", SqlDbType.NVarChar, 300),
new("@c_User", query.userName),
- new("@p_biLL_no", query.daa001),
+ // new("@p_biLL_no", query.daa001),
+ new("@p_biLL_no", query.billNo),
new("@p_item_barcode", query.barcode),
new("@num", query.Num)
};
@@ -207,7 +233,7 @@
var dto = new ProductionPickDto
{
- daa001 = query.daa001,
+ daa001 = query.daa001,
barcode = query.barcode,//鍘熸潯鐮�
cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index 17260f7..8aabbb9 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -71,7 +71,7 @@
var icoimg = "";
if (mesFile != null)
- icoimg = "http://192.168.1.187:81/upload/" +
+ icoimg = "http://116.148.211.203:81/upload/" +
mesFile.UrlPath;
groupObj.child.Add(new MesSysPageview
--
Gitblit v1.9.3