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/TransferOutManager.cs | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/service/Warehouse/TransferOutManager.cs b/service/Warehouse/TransferOutManager.cs
index 35f852c..34119aa 100644
--- a/service/Warehouse/TransferOutManager.cs
+++ b/service/Warehouse/TransferOutManager.cs
@@ -1,10 +1,10 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
-using NewPdaSqlServer.util;
using SqlSugar;
namespace NewPdaSqlServer.service.Warehouse;
@@ -33,10 +33,9 @@
pid = g.Key,
sq = g.Sum(x => x.FQty), // 鐢宠鏁伴噺鍚堣
ys = g.Sum(x => x.SQty), // 璋冨嚭宸叉壂鏁伴噺鍚堣
- rs = g.Sum(x => x.RQty) // 璋冨叆宸叉壂鏁伴噺鍚堣
+ rs = g.Sum(x => x.RQty), // 璋冨叆宸叉壂鏁伴噺鍚堣
})
- .Where(x =>
- !((x.sq ?? 0) == (x.ys ?? 0) && (x.sq ?? 0) == (x.rs ?? 0)))
+ .Where(x => !((x.sq ?? 0) == (x.ys ?? 0) && (x.sq ?? 0) == (x.rs ?? 0)))
.Select(x => x.pid)
.ToList();
@@ -60,17 +59,13 @@
{
if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璋冩嫧鍗曞彿涓虹┖");
- var sql1 =
- string.Format(
- @"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'",
- query.billNo);
+ var sql1 = string.Format(@"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'", query.billNo);
var dbck = Db.Ado.SqlQuery<ItemDetailModel>(sql1);
if (dbck.Count < 1) throw new Exception("璋冩嫧鍗曞彿涓嶅瓨鍦ㄦ垨鏈鏍革紒");
- var sql2 = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.FQty - b.SQty DSQty ,
+ var sql2 = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.FQty - b.SQty DSQty ,
dbo.F_QX_GETRECODEPOTSE(B.FMATERIALID,'','','') as RecoKw
FROM MES_DBCK_DETAIL B
LEFT JOIN MES_DBCK A ON A.ID = B.pid
@@ -137,17 +132,13 @@
{
if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璋冩嫧鍗曞彿涓虹┖");
- var sql1 =
- string.Format(
- @"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'",
- query.billNo);
+ var sql1 = string.Format(@"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'", query.billNo);
var dbck = Db.Ado.SqlQuery<ItemDetailModel>(sql1);
if (dbck.Count < 1) throw new Exception("璋冩嫧鍗曞彿涓嶅瓨鍦ㄦ垨鏈鏍革紒");
- var sql2 = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.RQty RQty,b.SQty - b.RQty DSQty ,
+ var sql2 = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.RQty RQty,b.SQty - b.RQty DSQty ,
dbo.F_QX_GETRECODEPOTSE(B.FMATERIALID,'','','') as RecoKw
FROM MES_DBCK_DETAIL B
LEFT JOIN MES_DBCK A ON A.ID = B.pid
@@ -211,13 +202,12 @@
// 鏍规嵁SQL鏌ヨ鏉′欢鑾峰彇寰呭鐞嗙殑鍑哄簱鏄庣粏
// 鍏宠仈鏌ヨTransferOutDetail銆乀ransferOut鍜孧esItems涓夊紶琛�
// 绛涢�夋潯浠�:鏈畬鎴愭暟閲忓ぇ浜�0涓斿崟鎹凡瀹℃牳
- var result = Db.Queryable<MesDbckDetail, MesDbck, MesItems>((b, a, s) =>
- new JoinQueryInfos(
+ var result = Db.Queryable<MesDbckDetail, MesDbck, MesItems>(
+ (b, a, s) => new JoinQueryInfos(
JoinType.Left, b.Pid == a.Id,
JoinType.Left, b.FMaterialId == s.Id.ToString()))
.Where((b, a, s) =>
- !((b.FQty ?? 0) == (b.SQty ?? 0) &&
- (b.FQty ?? 0) == (b.RQty ?? 0)) // 鏈畬鎴愭暟閲忓ぇ浜�0
+ !((b.FQty ?? 0) == (b.SQty ?? 0) && (b.FQty ?? 0) == (b.RQty ?? 0)) // 鏈畬鎴愭暟閲忓ぇ浜�0
&& a.FBillNo == p_bill_no // 鍖归厤鍗曟嵁鍙�
&& a.FApproveStatus == 1) // 鍗曟嵁宸插鏍�
.OrderBy((b, a, s) => s.ItemNo)
@@ -290,7 +280,7 @@
new("@split_num", SqlDbType.NVarChar, 300),
new("@c_user", query.userName),
new("@p_bill_no", p_bill_no),
- new("@p_item_barcode", p_item_barcode)
+ new("@p_item_barcode", p_item_barcode),
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -304,7 +294,7 @@
var barcodeNum = parameters[2].Value.ToString();
var splitNum = parameters[3].Value.ToString();
-
+
var result = Convert.ToInt32(_intSum);
if (result <= 0) throw new Exception(_strMsg);
@@ -370,9 +360,7 @@
&& !string.IsNullOrEmpty(x.FStockInId)
&& !string.IsNullOrEmpty(x.FOwnerInId))
.First();
- if (stock == null)
- throw new Exception(
- $"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
+ if (stock == null) throw new Exception($"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
// 鏌ヨ鐗╂枡淇℃伅
var item = Db.Queryable<MesItems>()
@@ -399,7 +387,7 @@
new("@c_user", query.userName),
new("@p_bill_no", p_bill_no),
new("@p_item_barcode", p_item_barcode),
- new("@p_depot_section_code", query.sectionCode)
+ new("@p_depot_section_code", query.sectionCode),
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -413,7 +401,7 @@
var barcodeNum = parameters[2].Value.ToString();
var outBillNo = parameters[3].Value.ToString();
-
+
var result = Convert.ToInt32(_intSum);
if (result <= 0) throw new Exception(_strMsg);
@@ -462,9 +450,7 @@
&& !string.IsNullOrEmpty(x.FStockInId)
&& !string.IsNullOrEmpty(x.FOwnerInId))
.First();
- if (stock == null)
- throw new Exception(
- $"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
+ if (stock == null) throw new Exception($"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
// 鏌ヨ鐗╂枡淇℃伅
var item = Db.Queryable<MesItems>()
@@ -510,8 +496,8 @@
var dto = new ProductionPickDto
{
daa001 = query.daa001,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -527,4 +513,5 @@
}
}
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3