From 52d1e37bb116c995b601728bfe81e3816c3944c9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 27 六月 2025 08:22:33 +0800
Subject: [PATCH] 1.携客云到货单主表新增单据类型字段 2.条码入库前拆分
---
service/Warehouse/MesCgthSqManager.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index 169d43d..dbb8747 100644
--- a/service/Warehouse/MesCgthSqManager.cs
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -27,7 +27,7 @@
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
+ dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID,A.depot_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
@@ -103,8 +103,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.billNo.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
- if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�"); if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_CGTH]", conn))
{
@@ -140,7 +139,7 @@
var dto = new ProductionPickDto
{
- daa001 = query.daa001,
+ daa001 = query.billNo,
barcodeNum = barcodeNum,
splitNum = splitNum,
barcode = query.barcode,
@@ -165,7 +164,7 @@
public ProductionPickDto ScanCodeCF(WarehouseQuery query)
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
@@ -187,7 +186,7 @@
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.billNo),
new("@p_item_barcode", query.barcode),
new("@num", query.Num)
};
@@ -207,7 +206,7 @@
var dto = new ProductionPickDto
{
- daa001 = query.daa001,
+ daa001 = query.billNo,
barcode = query.barcode,//鍘熸潯鐮�
cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
--
Gitblit v1.9.3