From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111
---
service/Warehouse/InventoryManager.cs | 95 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/service/Warehouse/InventoryManager.cs b/service/Warehouse/InventoryManager.cs
index 776dcf3..3fe3ff5 100644
--- a/service/Warehouse/InventoryManager.cs
+++ b/service/Warehouse/InventoryManager.cs
@@ -1,12 +1,15 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Text;
-using NewPdaSqlServer.DB;
+锘縰sing NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -61,10 +64,7 @@
))
.Where((a, b) => a.DepotSectionCode == p_section_code)
.Select((a, b) => new
- {
- a.DepotSectionName, b.DepotCode, b.DepotName, b.DepotId,
- b.FSubsidiary
- })
+ { a.DepotSectionName, b.DepotCode, b.DepotName, b.DepotId,b.FSubsidiary })
.Single();
// 濡傛灉搴撲綅浠ｇ爜涓嶅瓨鍦紝鍒欒繑鍥為敊璇俊鎭�
@@ -102,17 +102,17 @@
var wmsManager = new WmsBaseMangeer();
// 鏂板鍏ュ簱鏍￠獙锛堣皟鐢ㄥ瓨鍌ㄨ繃绋嬶級
var checkResult = wmsManager.pdaInvJY(
- Db,
- query.userName,
- p_item_barcode,
- p_section_code,
- depotSection.DepotId.ToString(),
- depotSection.FSubsidiary,
- "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
- "601" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
+ db: Db,
+ edtUserNo: query.userName,
+ barcode: p_item_barcode,
+ sectionCode: p_section_code,
+ stockId: depotSection.DepotId.ToString(),
+ stockOrgId: depotSection.FSubsidiary,
+ billNo: "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
+ transactionNo: "601" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
);
-
- if (Convert.ToInt32(checkResult.result) < 1)
+
+ if ( Convert.ToInt32(checkResult.result) < 1)
throw new Exception($"鍏ュ簱鏍￠獙澶辫触锛歿checkResult.strMsg}");
UseTransaction(db =>
@@ -150,14 +150,15 @@
SuppId = c_mes_inv_item_barcodes.SuppId,
SuppNo = c_mes_inv_item_barcodes.SuppNo,
UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag == null
- ? null
+ ?
+ null
: c_mes_inv_item_barcodes.UrgentFlag.Value
? "1"
: "0",
CbillNo = c_mes_inv_item_barcodes.BillNo,
Fstatus = 0,
ReceiveOrgId = depotSection.FSubsidiary,
- InType = "鏈熷垵鍏ュ簱"
+ InType = "鏈熷垵鍏ュ簱",
};
db.Insertable(newMesInvItemIns)
.IgnoreColumns(true)
@@ -198,7 +199,7 @@
BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
TaskNo = c_mes_inv_item_barcodes.TaskNo,
ItemId = c_mes_inv_item_barcodes.ItemId,
- ReceiveOrgId = depotSection.FSubsidiary
+ ReceiveOrgId = depotSection.FSubsidiary,
}).IgnoreColumns(true).ExecuteCommand();
@@ -254,7 +255,7 @@
SuppNo = c_mes_inv_item_barcodes.SuppNo,
ItemId = c_mes_inv_item_barcodes.ItemId,
IndepUserCode = c_user,
- StockOrgId = depotSection.FSubsidiary
+ StockOrgId = depotSection.FSubsidiary,
// Fsubsidiary = c_organize
}).IgnoreColumns(true).ExecuteCommand();
@@ -277,12 +278,11 @@
public dynamic GetDepoptsInfo(dynamic unity)
{
- //// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter>
- { new("@sectionCode", unity.sectionCode) };
- var sql2 =
- @" SELECT TOP 1 B.depot_code + '('+B.depot_name+')' depotsInfo,
+ //// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@sectionCode", unity.sectionCode) };
+
+ var sql2 = @" SELECT TOP 1 B.depot_code + '('+B.depot_name+')' depotsInfo,
B.FSubsidiary,
C.FNumber + '('+C.NAME+')' orgInfo
FROM MES_DEPOT_SECTIONS A
@@ -291,16 +291,17 @@
LEFT JOIN SYS_ORGANIZATION C ON C.FID = B.FSubsidiary
WHERE a.depot_section_code = @sectionCode;";
- var XcslItem =
- Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
// 妫�鏌ョ粨鏋滄湁鏁堟��
if (XcslItem == null)
- throw new Exception(
- $"搴撲綅 [{unity.sectionCode}] 涓嶅瓨鍦紝鎴栨墍灞炰粨搴撶姸鎬佸紓甯革紙鍙兘琚鐢ㄦ垨鍒犻櫎锛夈��");
+ {
+ throw new Exception($"搴撲綅 [{unity.sectionCode}] 涓嶅瓨鍦紝鎴栨墍灞炰粨搴撶姸鎬佸紓甯革紙鍙兘琚鐢ㄦ垨鍒犻櫎锛夈��");
+ }
return XcslItem; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
}
+
public dynamic GetItemsList(dynamic unity)
@@ -323,7 +324,10 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴旂墿鏂欎俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ if (XcslItem == null)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴旂墿鏂欎俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ }
return XcslItem;
}
@@ -348,15 +352,11 @@
cmd.CommandType = CommandType.StoredProcedure;
cmd.Parameters.AddRange(new[]
{
- new SqlParameter("@inUser", SqlDbType.NVarChar, 50)
- { Value = query.userName },
- new SqlParameter("@inItemId", SqlDbType.NVarChar, 50)
- { Value = query.itemid },
+ new SqlParameter("@inUser", SqlDbType.NVarChar, 50) { Value = query.userName },
+ new SqlParameter("@inItemId", SqlDbType.NVarChar, 50) { Value = query.itemid },
new SqlParameter("@isDesign", SqlDbType.Int) { Value = 0 },
- new SqlParameter("@in4", SqlDbType.NVarChar, 20)
- { Value = query.in4 ?? DBNull.Value },
- new SqlParameter("@in5", SqlDbType.NVarChar, 20)
- { Value = query.num ?? DBNull.Value }
+ new SqlParameter("@in4", SqlDbType.NVarChar, 20) { Value = query.in4 ?? DBNull.Value },
+ new SqlParameter("@in5", SqlDbType.NVarChar, 20) { Value = query.num ?? DBNull.Value }
});
try
@@ -367,30 +367,28 @@
while (reader.Read())
{
var barcode = reader.GetString(0);
-
+
// 鏋勫缓绗﹀悎鏂规硶绛惧悕鐨勫弬鏁板璞�
- var scanQuery = new WarehouseQuery
+ var scanQuery = new WarehouseQuery
{
barcode = barcode,
DepotCode = query.sectionCode, // 浠庡師濮媞uery鑾峰彇搴撲綅缂栫爜
userName = query.userName // 浠庡師濮媞uery鑾峰彇鐢ㄦ埛璐﹀彿
};
-
+
try
{
// 璋冪敤姝ｅ紡绛惧悕鏂规硶
ScanBarcode(scanQuery);
- var printData = GetPrintBar(barcode);
+ var printData = GetPrintBar(barcode);
resultList.Add(printData);
}
catch (Exception ex)
{
- throw new Exception(
- $"鏈熷垵鏉＄爜鎵撳嵃鍏ュ簱瀛樺湪寮傚父{ex.Message}锛岃閲嶆柊鎵撳嵃锛�");
+ throw new Exception($"鏈熷垵鏉＄爜鎵撳嵃鍏ュ簱瀛樺湪寮傚父{ex.Message}锛岃閲嶆柊鎵撳嵃锛�");
}
}
}
-
return resultList;
}
catch (Exception ex)
@@ -404,8 +402,7 @@
{
var sqlParams = new List<SugarParameter> { new("@barcode", barcode) };
- var sql1 =
- @" SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鏈熷垵鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
+ var sql1 = @" SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鏈熷垵鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
FROM MES_INV_ITEM_STOCKS A
LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
--
Gitblit v1.9.3