From 2d7c60af5abaae8da7001e9b2db5588bd5429a09 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 三月 2025 12:56:25 +0800
Subject: [PATCH] 1.受托退料
---
service/Warehouse/MesItemTblManager.cs | 240 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 195 insertions(+), 45 deletions(-)
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index d0284e4..2e2bcfc 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -4,24 +4,39 @@
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Security.Cryptography;
namespace NewPdaSqlServer.service.Warehouse;
+/// <summary>
+/// MES鐗╂枡琛ㄧ鐞嗙被
+/// </summary>
public class MesItemTblManager : Repository<MesItemTbl>
{
- public List<string> GetSCTLBillNo()
+ /// <summary>
+ /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
+ /// </summary>
+ /// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
+ public List<string> GetSCTLBillNo(WarehouseQuery query)
{
var list = Db.Queryable<MesItemTbl>()
- .Where(s => (s.Tbl013 ?? 0) == 1
- && (s.Tbl020 ?? 0) == 0)
+ .Where(s => (s.Tbl013 ?? 0) == 1 // 瀹℃牳閫氳繃
+ && (s.Tbl020 ?? 0) == 0
+ && s.Tbl008 == query.Type)
.Select(s => s.BillNo).ToList();
return list;
}
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇MES鐗╂枡琛ㄦ槑缁�
+ /// </summary>
+ /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
+ /// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
public List<MesItemTblDetail> GetMesItemTblDetailByBillNo(
WarehouseQuery query)
{
+ // 鍏宠仈鏌ヨ鐗╂枡琛ㄣ�佺墿鏂欐槑缁嗚〃鍜岀墿鏂欏熀纭�淇℃伅琛�
var mesItemTblDetails = Db
.Queryable<MesItemTbl, MesItemTblDetail, MesItems>(
(a, b, c) => new JoinQueryInfos(
@@ -29,31 +44,38 @@
a.Id == b.Tlmid,
JoinType.Left,
b.Tld009 == c.Id)
- ).Where((a, b, c) => a.BillNo == query.billNo)
+ ).Where((a, b, c) => a.BillNo == query.billNo && (a.Tbl013 ?? 0) == 1)
.Select<MesItemTblDetail>((a, b, c) => new MesItemTblDetail
{
BillNo = a.BillNo,
Tlid = b.Tlid,
Tlmid = b.Tlmid,
- Tld005 = b.Tld005 ?? 0,
- Tld006 = b.Tld006 ?? 0,
+ Tld005 = b.Tld005 ?? 0, // 寰呴��鏁伴噺
+ Tld006 = b.Tld006 ?? 0, // 宸查��鏁伴噺
Tld009 = b.Tld009,
- ItemNo = c.ItemNo,
- ItemName = c.ItemName,
- ItemModel = c.ItemModel
+ ItemNo = c.ItemNo, // 鐗╂枡缂栧彿
+ ItemName = c.ItemName, // 鐗╂枡鍚嶇О
+ ItemModel = c.ItemModel // 鐗╂枡鍨嬪彿
}).ToList();
+ // 绛涢�夊嚭寰呴��鏁伴噺澶т簬宸查��鏁伴噺鐨勮褰�
var itemTblDetails = mesItemTblDetails
.Where(s => (s.Tld005 ?? 0) - (s.Tld006 ?? 0) > 0).ToList();
return itemTblDetails;
}
+ /// <summary>
+ /// 鐢熶骇閫�鏂欐壂鎻忓簱浣�
+ /// </summary>
+ /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
+ /// <returns>搴撲綅淇℃伅</returns>
public WarehouseQuery SctlScanDepots(WarehouseQuery query)
{
if (query.DepotCode.IsNullOrEmpty())
throw new NullReferenceException("璇锋壂搴撲綅鏉＄爜");
+ // 鍏宠仈鏌ヨ搴撲綅鍒嗗尯鍜屽簱浣嶄俊鎭�
var warehouseQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
.Where((a, b) => a.DepotSectionCode == query.DepotCode)
@@ -70,18 +92,25 @@
return warehouseQuery;
}
+ /// <summary>
+ /// 鐢熶骇閫�鏂欐壂鎻忔潯鐮�
+ /// </summary>
+ /// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
+ /// <returns>澶勭悊缁撴灉</returns>
public WarehouseQuery SctlScanBarcode(WarehouseQuery query)
{
- var p_item_barcode = query.barcode;
- var p_bill_no = query.billNo;
- var p_section_code = query.DepotCode;
- var c_user = query.userName;
+ var p_item_barcode = query.barcode; // 鐗╂枡鏉＄爜
+ var p_bill_no = query.billNo; // 鍗曟嵁鍙�
+ var p_section_code = query.DepotCode; // 搴撲綅缂栫爜
+ var c_user = query.userName; // 鐢ㄦ埛鍚�
- var p_bill_type_id = 100;
- var p_transction_no = 104;
+ var p_bill_type_id = 100; // 鍗曟嵁绫诲瀷ID
+ var p_transction_no = 104; // 浜ゆ槗缂栧彿
+ // 楠岃瘉搴撲綅鏉＄爜
if (p_section_code.IsNullOrEmpty()) throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
+ // 鑾峰彇搴撲綅淇℃伅
var c_depot_code = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
.Where((a, b) => a.DepotSectionCode == p_section_code)
@@ -90,18 +119,21 @@
if (!c_depot_code.HasValue)
throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ // 鑾峰彇搴撲綅鍒嗗尯淇℃伅
var mesDepotSections = Db.Queryable<MesDepotSections>()
.Where(a => a.DepotSectionCode == p_section_code).First();
if (mesDepotSections == null)
throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ // 鑾峰彇搴撲綅鍩虹淇℃伅
var c_mes_depots = Db.Queryable<MesDepots>()
.Where(b => b.Guid == mesDepotSections.DepotGuid).First();
if (c_mes_depots == null)
throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ // 妫�鏌ユ潯鐮佹槸鍚﹀凡鍏ュ簱
var c_num = Db.Queryable<MesInvItemIns, MesInvItemInCDetails>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.Guid == b.ItemInId))
.Where((a, b) => b.ItemBarcode == p_item_barcode
@@ -116,6 +148,7 @@
if (c_num > 0) throw new Exception("姝ゆ潯鐮佸凡鎵叆搴擄紝鍕块噸澶嶆壂鎻忥紒");
+ // 鑾峰彇鏉＄爜淇℃伅
var c_mes_inv_item_barcodes = Db.Queryable<MesInvItemBarcodes>()
.Where(t => t.ItemBarcode == p_item_barcode).First();
@@ -125,43 +158,86 @@
if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
+ // 鑾峰彇閫�鏂欏崟淇℃伅
var C_MES_ITEM_TBL = Db.Queryable<MesItemTbl>()
.Where(a => a.BillNo == c_mes_inv_item_barcodes.BillNo
&& (a.Tbl013 ?? 0) == 1).First();
+
+ // 鑾峰彇閫�鏂欏崟淇℃伅
+ var tbWOMDAA = Db.Queryable<Womdaa>()
+ .Where(a => a.Guid.ToString() == C_MES_ITEM_TBL.Tbl002).First();
+
+
if (C_MES_ITEM_TBL == null) throw new Exception("鐢宠鍗曞凡鎾ゅ洖,鏃犳硶鎵爜!");
if (C_MES_ITEM_TBL.Tbl020 == 1) throw new Exception("鎵爜瀹屾垚,鐢宠鍗曞凡瀹岀粨!");
+ // 鑾峰彇閫�鏂欏崟鏄庣粏
var C_MES_ITEM_TBL_DETAIL = Db.Queryable<MesItemTblDetail>()
- .Where(a => a.Tlmid == C_MES_ITEM_TBL.Id
- && a.Tld010 == c_mes_inv_item_barcodes.WorkLine)
+ .Where(a => a.Tlid == c_mes_inv_item_barcodes.AboutGuid)
.First();
if (C_MES_ITEM_TBL_DETAIL == null)
throw new Exception("鏉＄爜涓嶅睘浜庤鐢宠鍗曟槑缁�,鏃犳硶鎵爜!");
+
+ var CABerpid = Db.Queryable<Womdab>().Where(womdab => womdab.Guid.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013).Select(womdab => womdab.Erpid).First();
+
+ var ownerId = Db.Queryable<Womcab>().Where(womcab => womcab.Erpid == CABerpid.Value).Select(womcab => womcab.OwnerId).First();
+
+ if (ownerId == null) throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠＄悊鍛�!");
+
+ var owner_type = "";
+ if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
+ {
+ owner_type = "BD_OwnerOrg";
+ }
+ else
+ {
+ // 绗簩灞傚垽鏂細妫�鏌� MES_CUSTOMER
+ if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+ {
+ owner_type = "BD_Customer";
+ }
+ else
+ {
+ // 绗笁灞傚垽鏂細妫�鏌� MES_SUPPLIER
+ if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+ {
+ owner_type = "BD_Supplier";
+ }
+ else
+ {
+ throw new Exception("鍏ュ簱澶辫触,鐢ㄦ枡娓呭崟璐т富淇℃伅瀛樺湪闂锛岃鑱旂郴绠＄悊鍛樿В鍐筹紒");
+ }
+ }
+ }
+
var c_quantity = c_mes_inv_item_barcodes.Quantity;
var c_bill_no = "";
var c_id = Guid.Empty;
+ // 浣跨敤浜嬪姟澶勭悊鏁版嵁鏇存柊
UseTransaction(db =>
{
+ // 鏌ヨ鍏ュ簱鍗�
var mesInvItemIns = db.Queryable<MesInvItemIns>()
.Where(d =>
d.Status == 0 && d.TransctionNo ==
p_transction_no.ToString()
- && d.CbillNo == c_mes_inv_item_barcodes.BillNo
+ && d.TaskNo == c_mes_inv_item_barcodes.BillNo
&& d.DepotsId == c_depot_code
&& d.InsDate.Value.ToString("yyyyMMdd") ==
DateTime.Now.ToString("yyyyMMdd")).First();
var totalResult = 0;
+ // 濡傛灉鍏ュ簱鍗曚笉瀛樺湪鍒欏垱寤烘柊鐨勫叆搴撳崟
if (mesInvItemIns == null)
{
- c_bill_no = BillNo.GetBillNo("IN(鍏ュ簱鍗�)");
+ c_bill_no = BillNo.GetBillNo("SCTL(鐢熶骇閫�鏂�)");
c_id = Guid.NewGuid();
@@ -170,19 +246,26 @@
Guid = c_id,
BillNo = c_bill_no,
BillTypeId = p_bill_type_id,
+ InsDate = DateTime.Now,
+ DepotsId = c_depot_code,
UserNoBack = c_user,
Reason = C_MES_ITEM_TBL.Tbl005,
Remark = C_MES_ITEM_TBL.Tbl006,
- InsDate = DateTime.Now,
- // DepotsCode = c_depot_code,
- DepotsId = c_depot_code,
+ //InsDate = DateTime.Now,
+ DepotsCode = c_mes_depots.DepotCode,
+ TaskNo = c_mes_inv_item_barcodes.BillNo,
+ //DepotsId = c_depot_code,
TransctionNo = p_transction_no.ToString(),
CreateBy = c_user,
CreateDate = DateTime.Now,
LastupdateBy = c_user,
LastupdateDate = DateTime.Now,
- CbillNo = C_MES_ITEM_TBL.BillNo,
- RbillNo = C_MES_ITEM_TBL.Tbl002
+ CbillNo = tbWOMDAA.Daa001,
+ InType = "鐢熶骇閫�鏂�",
+ ReceiveOrgId = c_mes_depots.FSubsidiary,
+ Fstatus = 0,
+ Status = 0,
+ WorkNo = tbWOMDAA.Daa021
}).IgnoreColumns(true).ExecuteCommand();
}
else
@@ -191,26 +274,76 @@
c_bill_no = mesInvItemIns.BillNo;
}
+ // 妫�鏌ユ槸鍚︿负鍚堝苟鎵撳嵃鏉＄爜
var hbdy = c_mes_inv_item_barcodes.Hbdy ?? 0;
if (hbdy == 1) throw new Exception("涓嶆敮鎸佸悎骞舵墦鍗扮殑鏉＄爜:" + p_item_barcode);
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 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())
+ .Count();
+
+ if (existingCount == 0)
+ // 涓嶅瓨鍦ㄦ椂鎻掑叆鏂拌褰�
+ db.Insertable(new MesInvItemInCItems
+ {
+ ItemInId = c_id,
+ Quantity = c_mes_inv_item_barcodes.Quantity,
+ CreateBy = c_user,
+ CreateDate = DateTime.Now,
+ ItemNo = c_mes_inv_item_barcodes.ItemNo,
+ //DepotCode = mesDepost.DepotCode,
+ ItemSname = c_mes_inv_item_barcodes.ItemSname,
+ Unit = c_mes_inv_item_barcodes.Unit,
+ Ebeln = c_mes_inv_item_barcodes.WorkNo,
+ BillNo = c_bill_no,
+ WorkNo = c_mes_inv_item_barcodes.WorkNo,
+ EbelnLineNo = c_mes_inv_item_barcodes.WorkLine,
+ CbillNo = c_mes_inv_item_barcodes.BillNo,
+ WorkLine = c_mes_inv_item_barcodes.WorkLine,
+ SuppId = c_mes_inv_item_barcodes.SuppId,
+ SuppNo = c_mes_inv_item_barcodes.SuppNo,
+ Remark = c_mes_inv_item_barcodes.Memo,
+ EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
+ LineK3id = c_mes_inv_item_barcodes.LineK3id,
+ ItemId = c_mes_inv_item_barcodes.ItemId,
+ DepotCode = c_mes_depots.DepotCode,
+ DepotId = c_depot_code.ToString()
+ }).IgnoreColumns(true).ExecuteCommand();
+ else
+ // 瀛樺湪鏃舵洿鏂版暟閲�
+ db.Updateable<MesInvItemInCItems>()
+ .SetColumns(it => new MesInvItemInCItems
+ {
+ 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())
+ //.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
+ .ExecuteCommand();
+
+
+ // 鎻掑叆 mes_inv_item_in_c_details 琛�
totalResult += db.Insertable(new MesInvItemInCDetails
{
- Guid = Guid.NewGuid(),
ItemInId = c_id,
BillNo = c_bill_no,
ItemBarcode = p_item_barcode,
- Quantity = c_quantity,
+ Quantity = c_mes_inv_item_barcodes.Quantity,
BarcodeFlag = true,
EpFlag = true,
WorkType = 1,
- ItemId = c_mes_inv_item_barcodes.ItemId,
ItemNo = c_mes_inv_item_barcodes.ItemNo,
- LotNo = c_mes_inv_item_barcodes.LotNo,
+ //LotNo = cgddDetails.BatchNumber,--鎵瑰彿锛岄��鏂欎笉璁剧疆鎵瑰彿
SuppId = c_mes_inv_item_barcodes.SuppId,
SuppNo = c_mes_inv_item_barcodes.SuppNo,
- DepotId = c_mes_depots.DepotId,
- DepotCode = c_mes_depots.DepotCode,
+ //DepotCode = mesDepost.DepotCode,
DepotSectionCode = p_section_code,
ItemSname = c_mes_inv_item_barcodes.ItemSname,
Unit = c_mes_inv_item_barcodes.Unit,
@@ -227,9 +360,19 @@
UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag,
BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
TaskNo = c_mes_inv_item_barcodes.TaskNo,
- RbillNo = C_MES_ITEM_TBL.Tbl002
+ EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
+ LineK3id = c_mes_inv_item_barcodes.LineK3id,
+ ItemId = c_mes_inv_item_barcodes.ItemId,
+ Ischeck = true,
+ //CheckDate = C_MES_ITEM_TBL_DETAIL.CheckDate,
+ //CheckRes = C_MES_ITEM_TBL_DETAIL.CheckRes,
+ //CheckStates = C_MES_ITEM_TBL_DETAIL.CheckStates,--妫�楠屼俊鎭�
+ ReceiveOrgId = c_mes_depots.FSubsidiary,
+ DepotCode = c_mes_depots.DepotCode,
+ DepotId = Convert.ToInt64(c_depot_code)
}).IgnoreColumns(true).ExecuteCommand();
+ // 鎻掑叆涓氬姟璁板綍
totalResult += db.Insertable(new MesInvBusiness2
{
Guid = Guid.NewGuid(),
@@ -259,6 +402,7 @@
ItemId = c_mes_inv_item_barcodes.ItemId
}).IgnoreColumns(true).ExecuteCommand();
+ // 鎻掑叆搴撳瓨璁板綍
totalResult += db.Insertable(new MesInvItemStocks
{
Guid = Guid.NewGuid(),
@@ -267,9 +411,9 @@
ItemNo = c_mes_inv_item_barcodes.ItemNo,
LotNo = c_mes_inv_item_barcodes.LotNo,
Quantity = c_mes_inv_item_barcodes.Quantity,
- EpFlag = c_mes_inv_item_barcodes.EpFlag.Value
- ? (byte)1
- : (byte)0,
+ //EpFlag = c_mes_inv_item_barcodes.EpFlag.Value
+ // ? (byte)1
+ // : (byte)0,
DepotId = c_mes_depots.DepotId,
DepotsCode = c_mes_depots.DepotCode,
DepotSectionsCode = p_section_code,
@@ -279,7 +423,13 @@
WorkNo = c_mes_inv_item_barcodes.WorkNo,
WorkLine = c_mes_inv_item_barcodes.WorkLine,
SuppNo = c_mes_inv_item_barcodes.SuppNo,
- ItemId = c_mes_inv_item_barcodes.ItemId
+ ItemId = c_mes_inv_item_barcodes.ItemId,
+ BillNo = c_mes_inv_item_barcodes.BillNo,
+ //DepotId = Convert.ToInt32(c_depot_code),
+ OwnerId = ownerId,
+ OwnerType = owner_type,
+ StockOrgId = c_mes_depots.FSubsidiary,
+ IndepUserCode = c_user
}).IgnoreColumns(true).ExecuteCommand();
// 鏍规嵁閫�鏂欑被鍨�(鑹搧閫�鏂欍�佹潵鏂欎笉鑹��鏂欍�佷綔涓氫笉鑹��鏂�)鏇存柊鐩稿叧鏁版嵁
@@ -335,10 +485,8 @@
Tld006 = (it.Tld006 ?? 0) +
(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)
+ .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id &&
+ it.Tlid == c_mes_inv_item_barcodes.AboutGuid)
.ExecuteCommand();
}
// 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -369,10 +517,8 @@
Tld006 = (it.Tld006 ?? 0) +
(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)
+ .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id &&
+ it.Tlid == c_mes_inv_item_barcodes.AboutGuid)
.ExecuteCommand();
}
@@ -382,7 +528,7 @@
c_mes_inv_item_barcodes.Quantity)
totalResult += Db.Updateable<MesItemTblDetail>()
.SetColumns(it => new MesItemTblDetail
- { Tld008 = 1 }) // 璁剧疆瀹屾垚鏍囧織
+ { Tld008 = 1 }) // 璁剧疆瀹屾垚鏍囧織
.Where(it => it.Tlid == C_MES_ITEM_TBL_DETAIL.Tlid)
.ExecuteCommand();
@@ -402,7 +548,11 @@
.Where(it => it.BillNo == p_bill_no)
.ExecuteCommand();
- if (totalResult < 3) throw new Exception("鎻掑叆澶辫触");
+ // 妫�鏌ュ繀瑕佺殑鎻掑叆鎿嶄綔鏄惁閮芥垚鍔熸墽琛�
+ var minimumExpectedOperations = 3; // 鑷冲皯闇�瑕佹墽琛岀殑鎻掑叆鎿嶄綔鏁�
+ if (totalResult < minimumExpectedOperations)
+ throw new Exception(
+ $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
return totalResult;
});
--
Gitblit v1.9.3