From 3170c6d56d1446732b87b6e83e850d29963bc29b Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 28 八月 2025 09:27:15 +0800
Subject: [PATCH] 移龙巍27号下午两点左右的打码版本
---
appsettings.json | 2
service/Warehouse/MesCgthSqManager.cs | 62 ++++++++++++++++++++++---------
service/base/LoginService.cs | 2
service/Wom/MesWorkProdManager.cs | 47 ++++++++++++++++-------
4 files changed, 79 insertions(+), 34 deletions(-)
diff --git a/appsettings.json b/appsettings.json
index 8c34ef8..2ba0f34 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -10,6 +10,6 @@
"TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
"ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
//"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=sa;Password =qixi123;Encrypt=True;TrustServerCertificate=True;"
- "DataBaseConn": "Data Source=192.168.8.8;Initial Catalog=GS_MES;User ID=sa;Password =JianHui@2025;Encrypt=True;TrustServerCertificate=True;"
+ "DataBaseConn": "Data Source=192.168.8.8;Initial Catalog=TEST_MES;User ID=sa;Password =JianHui@2025;Encrypt=True;TrustServerCertificate=True;"
}
}
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/Wom/MesWorkProdManager.cs b/service/Wom/MesWorkProdManager.cs
index 1f39ae2..c1352bf 100644
--- a/service/Wom/MesWorkProdManager.cs
+++ b/service/Wom/MesWorkProdManager.cs
@@ -294,31 +294,50 @@
var po_outSum = parameters[3].Value != DBNull.Value ? Convert.ToInt32(parameters[3].Value) : -1;
var po_womInBarSum = parameters[4].Value != DBNull.Value ? Convert.ToDecimal(parameters[4].Value) : 0m;
- var rksqOrder = Db.Queryable<MesInvItemIns>()
- .Where(x => x.RbillNo == barcode.BillNo && x.TransctionNo=="181" && x.CreateBy==request.StaffNo)
- .First();
- var sql = string.Format(@"SELECT A.item_barcode ItemBarcode,B.QUANTITY BgQuantity,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel
- FROM MES_INV_ITEM_IN_RKSQ_DETAILS A
- LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_barcode = B.ITEM_BARCODE
- LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
- WHERE A.bill_no= '{0}' ORDER BY A.create_date DESC", rksqOrder.BillNo);
+ // 澹版槑鍙橀噺鍦ㄥ灞傦紝纭繚鍦ㄦ墍鏈夊垎鏀腑閮藉彲璁块棶
+ MesInvItemIns rksqOrder = null;
+ List<MesInvItemInRksqDetails> rksqDetails = new List<MesInvItemInRksqDetails>();
- var RKSQ = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql);
+ if (po_outSum == 1)
+ {
+ rksqOrder = Db.Queryable<MesInvItemIns>()
+ .Where(x => x.RbillNo == barcode.BillNo && x.TransctionNo == "181" && x.CreateBy == request.StaffNo)
+ .First();
+ if (rksqOrder != null)
+ {
+ var sql = string.Format(@"SELECT A.item_barcode ItemBarcode,B.QUANTITY BgQuantity,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel
+FROM MES_INV_ITEM_IN_RKSQ_DETAILS A
+LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_barcode = B.ITEM_BARCODE
+LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
+WHERE A.bill_no= '{0}' ORDER BY A.create_date DESC", rksqOrder.BillNo);
- var rksqDetails = RKSQ.ToList();
+ rksqDetails = Db.Ado.SqlQuery<MesInvItemInRksqDetails>(sql).ToList();
+ }
+ }
+ else if (po_outSum == 2)
+ {
+ rksqOrder = Db.Queryable<MesInvItemIns>()
+ .Where(x => x.RbillNo == barcode.BillNo && x.TransctionNo == "181" && x.CreateBy == request.StaffNo)
+ .First();
+ if (rksqOrder != null)
+ {
+ rksqOrder.BillNo = "";
+ }
- //var rksqDetails = Db.Queryable<MesInvItemInRksqDetails>()
- // .Where(x => x.BillNo == )
- // .ToList();
+ rksqDetails = new List<MesInvItemInRksqDetails>();
+ }
// Check if the procedure failed
if (po_outSum == -1)
{
throw new Exception(po_outMsg);
}
+
+ // 澶勭悊rksqOrder涓簄ull鐨勬儏鍐�
+ string sjBillNo = rksqOrder?.BillNo ?? "";
// 15. Return processing result
return new ScanWorkResult
@@ -332,7 +351,7 @@
ItemName = item.ItemName,
ItemModel = workOrder.Daa004,
Message = po_outMsg,
- sjBillNo = rksqOrder.BillNo,
+ sjBillNo = sjBillNo,
BarcodesDetail = rksqDetails,
};
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