From 430f4df6519253ffaf49f2d098ac1df77aa5891e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 11 九月 2025 14:43:02 +0800
Subject: [PATCH] 销售出库添加一行'制单人'
---
service/Wom/WwGdManager.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 7dafa9b..dd7f308 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -1,5 +1,6 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using System.Threading.Tasks.Dataflow;
using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
@@ -168,7 +169,7 @@
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,
@@ -450,7 +451,8 @@
LineK3id = c_mes_inv_item_barcodes.LineK3id,
ItemId = c_mes_inv_item_barcodes.ItemId,
DepotCode = c_mes_depots.DepotCode,
- DepotId = c_depot_code.ToString()
+ DepotId = c_depot_code.ToString(),
+ itemDabid = c_mes_inv_item_barcodes.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鏃舵洿鏂版暟閲�
@@ -621,9 +623,9 @@
(int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
})
.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.Tld009 == c_mes_inv_item_barcodes.ItemId)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
// 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -655,9 +657,9 @@
(int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
})
.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.Tld009 == c_mes_inv_item_barcodes.ItemId)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
@@ -695,7 +697,7 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
+ var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);
return totalResult;
@@ -772,7 +774,7 @@
// 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍￠獙
var blDetail = Db.Queryable<MesItemBlDetail>()
.Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
+ b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
.First();
if (blDetail == null)
@@ -937,8 +939,9 @@
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
- DepotId = stockBarcode.DepotsId.ToString(),
- ItemDabid = womdab.Id,
+ DepotId = stockBarcode.DepotId.ToString(),
+ ItemDabid = blDetail.Id,
+ //AboutGuid = womdab.Id
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -971,7 +974,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
EbelnK3id = womdab.Eid,
LineK3id = womdab.Erpid
}).IgnoreColumns(true).ExecuteCommand();
@@ -1068,7 +1071,7 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 琛ユ枡鍗曞彿銆�"+ outNo +"銆�";
+ var LogMsg = "[PDA]"+query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 鏁伴噺銆�"+ stockBarcode.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�"+ outNo +"銆�";
logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);
return 1;
--
Gitblit v1.9.3