From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码
---
service/Wom/WwGdManager.cs | 110 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 777d7dc..acf49f6 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -1,6 +1,5 @@
锘縰sing System.Data;
using System.Data.SqlClient;
-using System.Threading.Tasks.Dataflow;
using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
@@ -159,17 +158,17 @@
if (wwgd?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
var womdabs = Db
- .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>(
- (a, b, c, d) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Id == b.Pid,
- JoinType.Inner,
- c.Id == b.Dab003,
- JoinType.Inner, b.Erpid.ToString() == d.ErpId
- ))
+ .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>((a, b, c,
+ d) =>
+ new JoinQueryInfos(
+ JoinType.Left,
+ a.Id == b.Pid,
+ JoinType.Inner,
+ c.Id == b.Dab003,
+ JoinType.Inner, b.Erpid.ToString() == d.ErpId
+ ))
.Where((a, b, c, d) =>
- a.Daa001 == query.daa001 && d.IssuingMethod == "1")
+ a.Daa001 == query.daa001)
.Select((a, b, c, d) => new WwGdDetail
{
Pid = b.Pid,
@@ -285,7 +284,6 @@
if (c_mes_inv_item_barcodes == null)
throw new Exception("姝ゆ潯鐮佷笉灞炰簬璇ラ��鏂欏崟锛岃鏍稿锛�");
-
// if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
// throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
@@ -320,12 +318,17 @@
throw new Exception("鏉＄爜涓嶅睘浜庤鐢宠鍗曟槑缁�,鏃犳硶鎵爜!");
//鍒ゆ柇璐т富淇℃伅
- var CABerpid = Db.Queryable<WwGdDetail>().Where(womdab => womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013).Select(womdab => womdab.Erpid).First();
+ var CABerpid = Db.Queryable<WwGdDetail>()
+ .Where(womdab =>
+ womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013)
+ .Select(womdab => womdab.Erpid).First();
- var WWCAB = Db.Queryable<ProductionOrderSub>().Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
+ var WWCAB = Db.Queryable<ProductionOrderSub>()
+ .Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
- if ( String.IsNullOrEmpty(WWCAB.Owner)) throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠＄悊鍛�!");
+ if (string.IsNullOrEmpty(WWCAB.Owner))
+ throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠＄悊鍛�!");
//var owner_type = "";
//if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
@@ -420,10 +423,10 @@
// 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 MES_INV_ITEM_IN_C_ITEMS 琛�
var existingCount = db.Queryable<MesInvItemInCItems>()
- .Where(it =>
- it.ItemInId == c_id &&
- it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
- it.DepotId == c_depot_code.ToString())
+ .Where(it =>
+ it.ItemInId == c_id &&
+ it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+ it.DepotId == c_depot_code.ToString())
.Count();
if (existingCount == 0)
@@ -459,12 +462,14 @@
db.Updateable<MesInvItemInCItems>()
.SetColumns(it => new MesInvItemInCItems
{
- Quantity = SqlFunc.IsNull(it.Quantity, 0) + c_mes_inv_item_barcodes.Quantity // 纭繚 Quantity 涓嶄负 null
+ Quantity = SqlFunc.IsNull(it.Quantity, 0) +
+ c_mes_inv_item_barcodes
+ .Quantity // 纭繚 Quantity 涓嶄负 null
})
- .Where(it =>
- it.ItemInId == c_id &&
- it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
- it.DepotId == c_depot_code.ToString())
+ .Where(it =>
+ it.ItemInId == c_id &&
+ it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+ it.DepotId == c_depot_code.ToString())
//.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
@@ -506,7 +511,7 @@
ReceiveOrgId = c_mes_depots.FSubsidiary,
EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
LineK3id = c_mes_inv_item_barcodes.LineK3id,
- Ischeck = true,
+ Ischeck = true
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟璁板綍
@@ -624,8 +629,8 @@
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
&& it.Tld009 == c_mes_inv_item_barcodes.ItemId)
- //&& it.Tld010 ==
- //c_mes_inv_item_barcodes.WorkLine)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
// 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -658,8 +663,8 @@
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
&& it.Tld009 == c_mes_inv_item_barcodes.ItemId)
- //&& it.Tld010 ==
- //c_mes_inv_item_barcodes.WorkLine)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
@@ -674,9 +679,9 @@
.ExecuteCommand();
// 妫�鏌ラ��鏂欏崟鏄惁鎵�鏈夋槑缁嗛兘宸插畬鎴�
- var remainingCount = Db.Queryable<MesItemTbl, MesItemTblDetail>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
+ var remainingCount = Db
+ .Queryable<MesItemTbl, MesItemTblDetail>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
.Where((a, b) =>
a.BillNo == p_bill_no &&
(b.Tld005 ?? 0) - (b.Tld006 ?? 0) > 0)
@@ -697,8 +702,10 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
- logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);
+ var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" +
+ c_bill_no + "銆�";
+ logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
+ "WW_GD", LogMsg, wwgd.Daa001);
return totalResult;
});
@@ -713,7 +720,7 @@
#region 濮斿琛ユ枡
/// <summary>
- /// 濮斿宸ュ崟琛ユ枡鎵爜
+ /// 濮斿宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -774,7 +781,8 @@
// 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍￠獙
var blDetail = Db.Queryable<MesItemBlDetail>()
.Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
+ b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId &&
+ b.Bld007 > b.Bld008)
.First();
if (blDetail == null)
@@ -842,13 +850,9 @@
//query.Type = "濮斿琛ユ枡";
var outNoType = "WWBL(濮斿琛ユ枡)";
if (query.Type == "濮斿琛ユ枡")
- {
outNoType = "WWBL(濮斿琛ユ枡)";
- }
else
- {
outNoType = "WWCL(濮斿瓒呴)";
- }
//outNoType = "WWBL(濮斿琛ユ枡)";
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var outId = Guid.NewGuid();
@@ -896,7 +900,7 @@
OutDate = DateTime.Now,
Status = 0,
DepotId = stockBarcode.DepotId,
- THORGID = stockBarcode.StockOrgId,
+ THORGID = stockBarcode.StockOrgId
//BbillNo = query.billNo
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -904,7 +908,9 @@
// 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
var itemCount = db.Queryable<MesInvItemOutItems>()
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId &&
+ i.ItemOutId == outId &&
+ i.DepotId == stockBarcode.DepotsId.ToString())
.Count();
if (itemCount > 0)
@@ -913,7 +919,10 @@
.SetColumns(i =>
i.TlQty == i.TlQty + stockBarcode.Quantity)
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId &&
+ i.ItemId == stockBarcode.ItemId &&
+ i.ItemOutId == outId &&
+ i.DepotId == stockBarcode.DepotsId.ToString())
.ExecuteCommand();
else
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -940,7 +949,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
DepotId = stockBarcode.DepotId.ToString(),
- ItemDabid = blDetail.Id,
+ ItemDabid = blDetail.Id
//AboutGuid = womdab.Id
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
@@ -1071,16 +1080,19 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "[PDA]"+query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 鏁伴噺銆�"+ stockBarcode.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�"+ outNo +"銆�";
- logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);
+ var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + query.barcode +
+ "銆� 鏁伴噺銆�" + stockBarcode.Quantity + "銆� 鍑哄簱鍗曞彿銆�" + outNo +
+ "銆�";
+ logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
+ "WW_GD", LogMsg, wwgd.Daa001);
return 1;
});
// 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
- var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ var finalPendingList = Db
+ .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
.Select((a, b) => new MesItemBlDetail
--
Gitblit v1.9.3