From f5a5d5f2c721b53ef3b8db6faa437911013142f3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 15 八月 2024 19:03:30 +0800
Subject: [PATCH] 调拨入库
---
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
index c27ff9a..48f5973 100644
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -2,6 +2,7 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.util;
using Newtonsoft.Json;
using SqlSugar;
using DbType = System.Data.DbType;
@@ -11,8 +12,6 @@
public class MesInvItemInCDetailsManager : Repository<MesInvItemInCDetails>
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- private readonly MessageCenterManager _messageCenterManager = new();
public PurchaseInventory SaveBarCodes(WarehouseQuery entity)
{
@@ -27,7 +26,7 @@
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
Db.Ado.ExecuteCommand(
- "BEGIN prc_rf_pda_scan_in_barcode(:c_in_str, :c_result); END;",
+ "BEGIN prc_rf_pda_scan_in_barcode_N(:c_in_str, :c_result); END;",
new SugarParameter("c_in_str", inputParam,
DbType.String), outputParam);
@@ -48,7 +47,7 @@
base.GetSingle(it => it.ItemBarcode == entity.barcode);
if (mesInvItemInCDetails == null)
- throw new Exception("鍑虹幇寮傚父"); // 鎶涘嚭寮傚父浠ヤ緵鍓嶅彴澶勭悊
+ throw new Exception("鐗╂枡鍏ュ簱鏉＄爜鏄庣粏涓嶅瓨鍦�"); // 鎶涘嚭寮傚父浠ヤ緵鍓嶅彴澶勭悊
var itemInId = mesInvItemInCDetails.ItemInId;
entity.id = itemInId;
@@ -108,36 +107,10 @@
}).ToPageList(query.PageIndex, query.Limit);
}
- public List<MesInvItemInCDetails> GetItemInDetails(decimal? pid)
+ public List<MesInvItemInCItems> GetItemInDetails(decimal? pid)
{
- var result = Db.Queryable<MesInvItemInCDetails, MesItems>(
- (g, c) => new JoinQueryInfos(
- JoinType.Left,
- g.ItemNo == c.ItemNo && g.Company == c.Company &&
- g.Factory == c.Factory
- )
- )
- .WhereIF(pid > 0, (g, c) => g.ItemInId == pid)
- .GroupBy((g, c) => new
- {
- g.Company, g.Factory, g.ItemInId, g.WorkNo, g.ItemNo,
- g.BoardStyle, g.WorkLine, c.ItemName, c.ItemModel, c.ItemUnit
- })
- .Select((g, c) => new MesInvItemInCDetails
- {
- Company = g.Company,
- Factory = g.Factory,
- ItemInId = g.ItemInId,
- WorkNo = g.WorkNo,
- ItemNo = g.ItemNo,
- ItemName = c.ItemName,
- ItemModel = c.ItemModel,
- ItemUnit = c.ItemUnit,
- BoardStyle = g.BoardStyle,
- WorkLine = g.WorkLine,
- SumQuantity = SqlFunc.AggregateSum(g.Quantity) // 鑱氬悎璁＄畻
- })
- .ToList();
+ var result = Db.Queryable<MesInvItemInCItems>()
+ .WhereIF(pid > 0, g => g.ItemInId == pid).ToList();
return result;
}
@@ -187,10 +160,11 @@
title = "閲囪喘鍏ュ簱鍗�" + query.billNo + "鍙嶅鏍�";
}
+ var ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
var message = new MessageCenter
{
TableName = tableName,
- Url = "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
+ Url = ErpUrl,
Status = 1,
CreateBy = query.userName,
Route = query.billNo,
@@ -201,6 +175,7 @@
Method = "POST",
Seq = 1,
Data = erpParameters,
+ IsMessage = 0,
ContentType = "application/x-www-form-urlencoded"
};
return message;
@@ -255,7 +230,7 @@
if (invItemIns.Status == 1) throw new Exception("鍏ュ簱鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�");
- var materials = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit,
+ var materials = Db.Queryable<MesInvItemInCItems, MesItems, MesUnit,
MesInvItemArnDetail>(
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
--
Gitblit v1.9.3