From aa4aa67abfdf69e30d5076451716e5aba11d5ec0 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期二, 14 四月 2026 16:12:40 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 936 +++++++++++++---------------------------------------------
1 files changed, 215 insertions(+), 721 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 94ef2cb..f40feae 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -84,6 +84,20 @@
using static WIDESEA_Common.NewHouseInboundPassBack.Parame.Syncretism;
using static WIDESEA_ITaskInfoService.ITaskService;
using Parameter = WIDESEA_Common.Parameter;
+using WIDESEA_DTO.ERP;
+using WIDESEA_OutboundRepository;
+using System.ComponentModel.DataAnnotations;
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Spire.Pdf;
+using WIDESEA_InboundRepository;
+using System.Drawing.Printing;
+using System;
+using WIDESEA_Common.Log;
+using static WIDESEA_Common.HouseInboundPassBack.data.data1;
+using System.Diagnostics;
namespace WIDESEA_TaskInfoService
{
@@ -157,6 +171,7 @@
public string ReceiveWMSTaskAllocatein = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAllocatein"];
public string ReceiveERPTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveERPTaskout"];
public string InMaterialWarehousingCallback = WIDESEA_Core.Helper.AppSettings.Configuration["InMaterialWarehousingCallback"];
+ public string LEDAPI = WIDESEA_Core.Helper.AppSettings.Configuration["LEDAPI"];
/// <summary>
@@ -603,7 +618,7 @@
return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍏ュ簱鍗曟槑缁�");
}
- // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
+ // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
foreach (var inboundOrderDetail in inboundOrderDetails)
{
// 妫�鏌ヨ鏄庣粏鏄惁宸插叏閮ㄥ叆搴�
@@ -887,7 +902,7 @@
.ToList();
Dt_InboundOrder? dt_InboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == inboundOrder.OrderNo).Includes(x => x.Details).First();
- if (StockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ if (StockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
var houseSyncretism = new NewHouseInboundPassBack
{
@@ -1417,7 +1432,7 @@
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(
stockInfo, stockInfo.Details,
- stockInfo.Details.Sum(x => x.StockQuantity),
+ 0,
stockInfo.Details.Sum(x => x.StockQuantity),
StockChangeType.Inbound, task.TaskNum);
}
@@ -1769,7 +1784,7 @@
.Where(x => x.OrderId == outboundOrder.Id)
.ToList();
}
- if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0 && outboundOrderDetails1.Count == 0))
+ if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0 && outboundOrderDetails1.Count == 0))
{
throw new Exception($"鏈壘鍒版墭鐩� {stockInfo.PalletCode} 鍦ㄨ揣浣� {stockInfo.LocationCode} 涓婄殑鍑哄簱鍗曟槑缁�");
}
@@ -1938,7 +1953,7 @@
}
// 璋冩嫧鍑哄簱
- if (outboundOrder.OrderType == 4)
+ if (outboundOrder.OrderType == 3)
{
var allocate = new InventoryAllocate
{
@@ -2170,7 +2185,7 @@
}
// 璋冩嫧鍑哄簱
- if (outboundOrder.OrderType == 4)
+ if (outboundOrder.OrderType == 3)
{
var allocate = new InventoryAllocate
{
@@ -2261,10 +2276,14 @@
{
Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo).First();
- outboundOrderDetails.Add(outboundOrderDetail);
+ if (outboundOrderDetail != null)
+ {
+ outboundOrderDetails.Add(outboundOrderDetail);
+ }
+
}
- for (var i = 0; i<outboundOrderDetails.Count; i++)
+ for (var i = 0; i < outboundOrderDetails.Count; i++)
{
if (outboundOrderDetails[i].LocationName != null && outboundOrderDetails[i].LocationName != "")
{
@@ -2452,7 +2471,7 @@
// 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
if (locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
{
- AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
+ AddDWANDYSRetrueOrder(task, stockInfo, inboundOrder);
}
// 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
@@ -2469,6 +2488,7 @@
// 娣诲姞鐘舵�佸彉鏇磋褰�
AddStatusChangeRecord(task, stockInfo, locationInfo);
+
// 鏍规嵁璁㈠崟绫诲瀷澶勭悊涓嶅悓閫昏緫
@@ -2545,12 +2565,11 @@
private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref List<Dt_OutboundOrderDetail> inboundOrderDetails)
{
List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
- int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+ int CompeletedNum = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
{
string BatchNo = newOutboundOrderDetail.BatchNo;
//inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
-
foreach (var item in stockInfo.Details)
{
if (newOutboundOrderDetail == null) continue;
@@ -2564,16 +2583,17 @@
if (newOutboundOrderDetail.OverOutQuantity == newOutboundOrderDetail.OrderQuantity)
{
newOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
+ CompeletedNum++;
}
else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
{
newOutboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
}
}
}
- if (inboundOrder.Details.Count() == overCount)
+ if (inboundOrder.Details.Count == CompeletedNum)
{
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
@@ -2609,6 +2629,12 @@
StockChangeType.Outbound.ObjToInt(),
stockInfo.Details.FirstOrDefault()?.OrderNo ?? "",
task.TaskNum);
+
+ _recordService.StockQuantityChangeRecordService.NEWAddStockChangeRecord(
+ stockInfo, stockInfo.Details,
+ stockInfo.Details.Sum(x => x.StockQuantity),
+ stockInfo.Details.Sum(x => x.OutboundQuantity),
+ StockChangeType.Outbound, task.TaskNum);
}
private void ProcessNormalOutbound(Dt_Task task, Dt_StockInfo stockInfo,
@@ -2908,7 +2934,7 @@
}
//浣庢俯銆佽嵂姘村洖搴撳崟
- private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
+ private void AddDWANDYSRetrueOrder(Dt_Task task, Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
{
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
@@ -2937,6 +2963,22 @@
}
else
{
+ var postData = new
+ {
+ DeviceCode = task.NextAddress, // 灞忓箷缂栧彿
+ MaterialCode = outboundOrder.Details.FirstOrDefault()?.MaterielCode,//鐗╂枡绫诲瀷
+ BackNum = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity,//鍥炲簱鏁�
+ SendNum = outboundOrder.Details.FirstOrDefault()?.OrderQuantity//鍙戞枡鏁�
+ };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+ using (var client = new HttpClient())
+ {
+ var content = new StringContent(json, Encoding.UTF8, "application/json");
+ var response = client.PostAsync(LEDAPI, content).Result;
+ string result = response.Content.ReadAsStringAsync().Result;
+ }
+
+
bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
if (allowCompeted)
{
@@ -3496,65 +3538,171 @@
}
}
- public virtual void PrintTestDirect(string fullPath)
+ public void PrintTestDirect(string fullPath)
{
- const int maxRetryCount = 3;
- const int retryDelayMs = 1000;
-
if (!File.Exists(fullPath))
{
- Console.WriteLine($"鎵撳嵃澶辫触锛氭枃浠朵笉瀛樺湪 {fullPath}");
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触锛氭枃浠朵笉瀛樺湪 {fullPath}");
return;
}
- // 鑾峰彇閰嶇疆鐨勬墦鍗版満鍚嶇О
- string printerName = AppSettings.app("PrinterName");
+ // 鑾峰彇鎵撳嵃鏈哄悕绉伴厤缃�
+ string printerName = AppSettings.app("PrinterName")?.Trim();
if (string.IsNullOrEmpty(printerName))
{
- Console.WriteLine("鉁� 鎵撳嵃澶辫触锛氭湭閰嶇疆鎵撳嵃鏈哄悕绉�");
- return;
+ // 濡傛灉娌℃湁閰嶇疆锛屼娇鐢ㄧ郴缁熼粯璁ゆ墦鍗版満
+ printerName = GetDefaultPrinterUbuntu();
}
- // 鐩存帴浣跨敤閰嶇疆鐨勬墦鍗版満鍚嶇О锛屼笉杩涜浠讳綍杞崲
- PrintUsingConfiguredPrinter(fullPath, printerName.Trim());
+ PrintUsingUbuntuPrinter(fullPath, printerName);
+ }
+ /// <summary>
+ /// 鑾峰彇 Ubuntu 榛樿鎵撳嵃鏈�
+ /// </summary>
+ private string GetDefaultPrinterUbuntu()
+ {
+ try
+ {
+ ProcessStartInfo psi = new ProcessStartInfo
+ {
+ FileName = "lpstat",
+ Arguments = "-d",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true
+ };
+
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
+
+ // 瑙ｆ瀽榛樿鎵撳嵃鏈哄悕绉帮紝渚嬪: "system default destination: LenovoPrinter"
+ if (output.Contains(":"))
+ {
+ return output.Split(':')[1].Trim();
+ }
+ return "LenovoPrinter"; // 榛樿鍥為��
+ }
+ }
+ catch
+ {
+ return "LenovoPrinter";
+ }
+ }
+
+ /// <summary>
+ /// Ubuntu 鎵撳嵃瀹炵幇
+ /// </summary>
+ private void PrintUsingUbuntuPrinter(string filePath, string printerName)
+ {
+ try
+ {
+ PrintWithLpr(filePath, printerName);
+
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触: {ex.Message}");
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 浣跨敤 lpr 鍛戒护鎵撳嵃
+ /// </summary>
+ private void PrintWithLpr(string filePath, string printerName)
+ {
+ Console.WriteLine($"馃搫 姝ｅ湪鎵撳嵃鍒� {printerName}: {Path.GetFileName(filePath)}");
+
+ // 浣跨敤 lp 鍛戒护锛屾坊鍔� -o raw 閫夐」
+ string command = $"lp -d {printerName} -o raw \"{filePath}\"";
+
+ ExecuteShellCommand(command);
+ }
+ /// <summary>
+ /// 鎵ц Shell 鍛戒护
+ /// </summary>
+ private void ExecuteShellCommand(string command)
+ {
+ ProcessStartInfo psi = new ProcessStartInfo
+ {
+ FileName = "/bin/bash",
+ Arguments = $"-c \"{command.Replace("\"", "\\\"")}\"",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true
+ };
+
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ string error = process.StandardError.ReadToEnd();
+ process.WaitForExit();
+
+ if (process.ExitCode == 0)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃浠诲姟鎻愪氦鎴愬姛");
+ if (!string.IsNullOrEmpty(output))
+ Console.WriteLine($"杈撳嚭: {output}");
+ }
+ else
+ {
+ throw new InvalidOperationException($"鍛戒护鎵ц澶辫触: {error}");
+ }
+ }
}
/// <summary>
/// 鍙娇鐢ㄩ厤缃殑鎵撳嵃鏈鸿繘琛屾墦鍗�
/// </summary>
+ /// <summary>
+ /// Ubuntu 鎵撳嵃鏂规硶 - 浣跨敤 lpr 鍛戒护
+ /// </summary>
private void PrintUsingConfiguredPrinter(string filePath, string printerName)
{
try
{
- // 1. 棣栧厛楠岃瘉鎵撳嵃鏈烘槸鍚﹀瓨鍦�
- if (!IsPrinterInstalled(printerName))
+ // 1. 妫�鏌ユ墦鍗版満鏄惁鍦ㄧ嚎
+ if (!IsPrinterAvailableUbuntu(printerName))
{
- Console.WriteLine($"鉁� 鎵撳嵃鏈� '{printerName}' 鏈畨瑁呮垨涓嶅瓨鍦�");
- Console.WriteLine("\n绯荤粺宸插畨瑁呯殑鎵撳嵃鏈哄垪琛�:");
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
- {
- Console.WriteLine($" - {printer}");
- }
- throw new InvalidOperationException($"鎵撳嵃鏈� '{printerName}' 鏈畨瑁�");
+ throw new InvalidOperationException($"鎵撳嵃鏈� '{printerName}' 涓嶅彲鐢ㄦ垨鏈壘鍒�");
}
- // 3. 浣跨敤 Spire.PDF 鎵撳嵃
- using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
+ Console.WriteLine($"鉁� 浣跨敤鎵撳嵃鏈�: {printerName}");
+ Console.WriteLine($"鉁� 姝ｅ湪鎵撳嵃: {Path.GetFileName(filePath)}");
+
+ // 2. 浣跨敤 lpr 鍛戒护鎵撳嵃
+ ProcessStartInfo psi = new ProcessStartInfo
{
- // 鍔犺浇鏂囦欢
- pdf.LoadFromFile(filePath);
+ FileName = "lpr",
+ Arguments = $"-P {printerName} \"{filePath}\"",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true
+ };
- // 璁剧疆鎵撳嵃鏈哄悕绉帮紙鍙娇鐢ㄩ厤缃殑鍚嶇О锛�
- pdf.PrintSettings.PrinterName = printerName;
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ string error = process.StandardError.ReadToEnd();
+ process.WaitForExit();
- Console.WriteLine($"鉁� 浣跨敤閰嶇疆鐨勬墦鍗版満: {printerName}");
- Console.WriteLine($"鉁� 姝ｅ湪鎵撳嵃: {Path.GetFileName(filePath)}");
-
- // 鐩存帴鎵撳嵃
- pdf.Print();
- Console.WriteLine("鉁� 鎵撳嵃浠诲姟宸叉彁浜�");
+ if (process.ExitCode == 0)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃浠诲姟宸叉彁浜ゅ埌 {printerName}");
+ }
+ else
+ {
+ throw new InvalidOperationException($"鎵撳嵃澶辫触: {error}");
+ }
}
}
catch (Exception ex)
@@ -3565,155 +3713,29 @@
}
/// <summary>
- /// 浠庨厤缃殑鍙嬪ソ鍚嶇О鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
+ /// Ubuntu 妫�鏌ユ墦鍗版満鍙敤鎬�
/// </summary>
- private string GetActualPrinterName(string displayName)
- {
- if (string.IsNullOrEmpty(displayName))
- return string.Empty;
-
- // 濡傛灉閰嶇疆鐨勬槸 "192.168.99.3 涓婄殑 Lenovo M7605D"
- if (displayName.Contains("192.168.99.3 涓婄殑 Lenovo M7605D"))
- {
- // 鍦ㄧ郴缁熶腑鏌ユ壘瀹為檯鐨勬墦鍗版満鍚嶇О
- return FindActualPrinterForIP("192.168.99.3");
- }
-
- // 濡傛灉鐩存帴閰嶇疆鐨勬槸IP鍦板潃
- if (displayName.Contains("192.168.99.3"))
- {
- return FindActualPrinterForIP("192.168.99.3");
- }
-
- // 濡傛灉宸茬粡鏄疄闄呯殑鎵撳嵃鏈哄悕绉帮紝鐩存帴杩斿洖
- if (IsPrinterInstalled(displayName))
- {
- return displayName;
- }
-
- // 榛樿杩斿洖鍘熷悕绉�
- return displayName;
- }
-
- /// <summary>
- /// 鏌ユ壘IP鍦板潃瀵瑰簲鐨勫疄闄呮墦鍗版満鍚嶇О
- /// </summary>
- private string FindActualPrinterForIP(string ipAddress)
+ private bool IsPrinterAvailableUbuntu(string printerName)
{
try
{
- // 鑾峰彇鎵�鏈夋墦鍗版満
- var allPrinters = new List<string>();
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
+ ProcessStartInfo psi = new ProcessStartInfo
{
- allPrinters.Add(printer);
- }
-
- Console.WriteLine($"鏌ユ壘IP鍦板潃 {ipAddress} 瀵瑰簲鐨勬墦鍗版満...");
- Console.WriteLine("绯荤粺鎵撳嵃鏈哄垪琛�:");
- foreach (var printer in allPrinters)
- {
- Console.WriteLine($" - {printer}");
- }
-
- // 浼樺厛鏌ユ壘鍖呭惈IP鍦板潃鐨勬墦鍗版満
- foreach (string printer in allPrinters)
- {
- if (printer.Contains(ipAddress))
- {
- Console.WriteLine($"鉁� 鎵惧埌鍖呭惈IP鐨勬墦鍗版満: {printer}");
- return printer;
- }
- }
-
- // 鏌ユ壘鑱旀兂鎵撳嵃鏈�
- foreach (string printer in allPrinters)
- {
- if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
- {
- Console.WriteLine($"鉁� 鎵惧埌鑱旀兂鎵撳嵃鏈�: {printer}");
- return printer;
- }
- }
-
-
- // 杩斿洖绗竴涓彲鐢ㄧ殑鎵撳嵃鏈�
- if (allPrinters.Any())
- {
- Console.WriteLine($"鈿狅笍 鏈壘鍒扮簿纭尮閰嶏紝浣跨敤绗竴涓墦鍗版満: {allPrinters.First()}");
- return allPrinters.First();
- }
-
- return string.Empty;
- }
- catch (Exception ex)
- {
- Console.WriteLine($"鏌ユ壘鎵撳嵃鏈哄け璐�: {ex.Message}");
- return string.Empty;
- }
- }
-
- /// <summary>
- /// 妫�鏌ユ墦鍗版満鏄惁宸插畨瑁�
- /// </summary>
- private bool IsPrinterInstalled(string printerName)
- {
- try
- {
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
- {
- if (printer.Equals(printerName, StringComparison.OrdinalIgnoreCase))
- {
- return true;
- }
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
- /// <summary>
- /// 浣跨敤鍘熷鎵撳嵃鍛戒护
- /// </summary>
- private void PrintUsingRawCommand(string filePath, string printerName)
- {
- try
- {
- var processStartInfo = new System.Diagnostics.ProcessStartInfo
- {
- FileName = filePath,
- Verb = "print", // 浣跨敤"print"鍔ㄨ瘝
- UseShellExecute = true, // 鍏抽敭锛氬惎鐢⊿hell鎵ц
+ FileName = "lpstat",
+ Arguments = $"-p {printerName}",
+ UseShellExecute = false,
CreateNoWindow = true,
- WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
+ RedirectStandardOutput = true
};
- // 璁剧疆鎵撳嵃鏈猴紙鍙�夛紝绯荤粺閫氬父浼氫娇鐢ㄩ粯璁ゆ墦鍗版満锛�
- // processStartInfo.Arguments = $"/t \"{filePath}\" \"{printerName}\"";
-
- System.Diagnostics.Process.Start(processStartInfo);
- }
- catch (Exception ex)
- {
- Console.WriteLine($"鎵撳嵃澶辫触: {ex.Message}");
- // 鍙互灏濊瘯鍏朵粬鏂规硶
- //TryAlternativePrintMethod(filePath, printerName);
- }
- }
-
-
- /// <summary>
- /// 妫�鏌ユ枃浠舵槸鍚﹀彲璁块棶
- /// </summary>
- private bool IsFileAccessible(string filePath)
- {
- try
- {
- using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+ using (Process process = new Process { StartInfo = psi })
{
- return fs.Length > 0;
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
+
+ return output.Contains($"{printerName} is idle") ||
+ output.Contains($"{printerName} is ready");
}
}
catch
@@ -3721,25 +3743,6 @@
return false;
}
}
-
- /// <summary>
- /// 灏濊瘯寮哄埗鍨冨溇鍥炴敹锛岄噴鏀惧彲鑳藉瓨鍦ㄧ殑鏂囦欢鍙ユ焺
- /// </summary>
- private void TryForceGarbageCollection()
- {
- try
- {
- GC.Collect();
- GC.WaitForPendingFinalizers();
- Console.WriteLine("宸叉墽琛屽瀮鍦惧洖鏀�");
- }
- catch (Exception ex)
- {
- Console.WriteLine($"鍨冨溇鍥炴敹澶辫触: {ex.Message}");
- }
- }
-
-
/// <summary>
/// 鐩樼偣鍑哄簱瀹屾垚
/// </summary>
@@ -3900,520 +3903,11 @@
#endregion
-
-
-
- #region
- //public WebResponseContent InboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟");
- // }
- // if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
- // }
- // Dt_StockInfo dt_StockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x => x.Details).First();
- // if (dt_StockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
- // }
-
- // if (!string.IsNullOrEmpty(dt_StockInfo.LocationCode))
- // {
- // return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- // }
-
- // if (dt_StockInfo.Details == null || dt_StockInfo.Details.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
- // }
- // Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- // if (dt_LocationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒扮洰鏍囪揣浣嶄俊鎭�");
- // }
-
- // if (dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- // }
- // int lastStatus = dt_LocationInfo.LocationStatus;
- // dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- // Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
-
- // dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
-
-
- // Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
- // Dt_InboundOrderDetail? inboundOrderDetail = null;
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄叆搴撹繕鏄皟鎷ㄥ叆搴撱�傘�傘�傚叆搴�
- // if (inboundOrder.OrderType == 0 && inboundOrder != null && dt_StockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
- // {
- // #region //鍒ゆ柇鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗�
- // //鏌ヨ鍘熷畬鎴愮殑鍏ュ簱鏄庣粏鏁伴噺
- // int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
- // //鏄庣粏id鏌ヨ
- // inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.LinId == dt_StockInfo.Details.FirstOrDefault()?.LinId);
- // foreach (var item in dt_StockInfo.Details)
- // {
- // if (inboundOrderDetail == null)
- // {
- // continue;
- // }
- // inboundOrderDetail.OverInQuantity += item.StockQuantity;
- // if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
- // {
- // inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // overCount += 1;
- // }
- // else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- // {
- // inboundOrderDetail.OrderDetailStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- // }
- // }
- // dt_StockInfo.Details.ForEach(x =>
- // {
- // x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- // });
-
- // _unitOfWorkManage.BeginTran();
- // task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.浜哄伐瀹屾垚 : OperateType.鑷姩瀹屾垚);
-
- // _basicService.LocationInfoService.Repository.UpdateData(dt_LocationInfo);
- // _stockRepository.StockInfoRepository.UpdateData(dt_StockInfo);
- // _stockRepository.StockInfoDetailRepository.UpdateData(dt_StockInfo.Details);
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(dt_LocationInfo, lastStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
- // _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(dt_StockInfo, dt_StockInfo.Details, dt_StockInfo.Details.Sum(x => x.StockQuantity), dt_StockInfo.Details.Sum(x => x.StockQuantity), StockChangeType.Inbound, task.TaskNum);
- // if (inboundOrder != null)
- // {
- // _inboundService.InbounOrderService.UpdateData(inboundOrder);
- // _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
- // }
- // _unitOfWorkManage.CommitTran();
-
-
-
-
- // if (inboundOrder.Details.Count == 1)
- // {
- // var stockInfoDetail = dt_StockInfo.Details.FirstOrDefault();
-
- // #region//鍏ュ簱淇℃伅杩斿洖涓婁綅WMS銆傘�傜珛搴撳叆搴撴暟閲忓洖浼�
- // HouseInboundPassBack houseInboundPassBack = new HouseInboundPassBack();
- // houseInboundPassBack.ApiType = "AsnController";
- // houseInboundPassBack.Method = "AsrsGroudingAsn";
- // data data = new data();
- // data.data1 data1 = new data.data1();
- // data1.AsnNo = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // data.data1.Inbound inbound = new data.data1.Inbound
- // {
- // LinId = stockInfoDetail.LinId,
- // MaterielCode = stockInfoDetail.MaterielCode,
- // OrderQuantity = stockInfoDetail.StockQuantity,
- // BatchNo = stockInfoDetail.BatchNo,
- // FinishQty = stockInfoDetail.StockQuantity,
- // LocationName = task.TargetAddress
- // };
- // data.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(data);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // }
- // }
- // else
- // {
- // #region //鍒ゆ柇璋冩嫧鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗曞苟涓�娆¤繑鍥炲叆搴撴槑缁嗕俊鎭�
- // if (inboundOrder.Details.Count == 1)
- // {
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == inboundOrderDetail.BatchNo);
- // Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
- // {
- // OrderStatus = inboundOrder.OrderStatus,
- // CreateType = inboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = inboundOrder.UpperOrderNo,
- // OrderNo = inboundOrder.OrderNo,
- // //OutWareHouse = inboundOrder.OutWareHouse,
- // TransactionCode = inboundOrder.TransactionCode,
- // InoutType = inboundOrder.InoutType,
- // OrderType = inboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _inboundService.InbounOrderService.DeleteData(inboundOrder);
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_HtyS = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // #endregion
- // #region//璋冩嫧浠诲姟鏁伴噺鍥炰紶WMS
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = detail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.StockQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.StockQuantity;
- // inbound.LocationName = item.LocationCode;
- // data1.DetailList.Add(inbound);
- // }
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // }
- // #endregion
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
- #region
- //public WebResponseContent OutboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
- // }
-
- // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
-
- // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- // if (stockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
- // }
- // if (locationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶄俊鎭�");
- // }
-
- // List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
- // if (outStockLockInfos == null || outStockLockInfos.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
- // }
-
- // List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
- // for (int i = 0; i < outStockLockInfos.Count; i++)
- // {
- // Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfos[i].OrderDetailId);
- // if (outboundOrderDetail != null)
- // {
- // outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
- // if (outboundOrderDetail.LockQuantity == outboundOrderDetail.OrderQuantity)
- // {
- // outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // }
- // outboundOrderDetails.Add(outboundOrderDetail);
- // }
- // }
-
- // _unitOfWorkManage.BeginTran();
- // _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
-
- // stockInfo.LocationCode = locationInfo.LocationCode;
- // stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- // _stockService.StockInfoService.Repository.UpdateData(stockInfo);
-
- // int beforeStatus = locationInfo.LocationStatus;
- // locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
-
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- // _unitOfWorkManage.CommitTran();
- // Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == stockInfo.Id).First();
- // Dt_OutboundOrderDetail outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.LPNNo == stockInfo.PalletCode).First();
- // Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄嚭搴撹繕鏄皟鎷ㄥ嚭搴撱�傘�傘�傚嚭搴�
- // if (outboundOrder.OrderType == 1)
- // {
- // #region //鍒ゆ柇鍑哄簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍑哄簱鍗�
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
- // #endregion
- // #region//鍑哄簱淇℃伅杩斿洖涓婁綅WMS銆傘�傘�傜珛搴撳嚭搴撴暟閲忓洖浼�
- // HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
- // houseInboundPassBack.ApiType = "ShippingOrderController";
- // houseInboundPassBack.Method = "AsrsOutboundSO";
- // datas datas = new datas();
- // datas.data1 data1 = new datas.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.OutWareHouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // datas.data1.Inbound inbound = new datas.data1.Inbound();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = task.PalletCode;
- // inbound.MaterielCode = stockInfoDetail.MaterielCode;
- // inbound.OrderQuantity = stockInfoDetail.OutboundQuantity;
- // inbound.BatchNo = stockInfoDetail.BatchNo;
- // inbound.FinishQty = stockInfoDetail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // datas.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(datas);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskout, houseInboundPassBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // //鍒犻櫎搴撳瓨淇℃伅
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // else if (outboundOrder.OrderType == 240)
- // {
- // //鐩樼偣鍑哄簱浠诲姟瀹屾垚銆併�併�併�併�併�併�併�併�佷笉鑳藉垹闄ゅ簱瀛樼瓑閫昏緫
- // }
- // else
- // {
-
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == outDetail.BatchNo);
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
-
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.OutboundQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // data1.DetailList.Add(inbound);
- // }
-
-
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
+ public class LEDDTO
+ {
+ public string DeviceCode { get; set; }
+ public string MaterialCode { get; set; }
+ public int BackNum { get; set; }
+ public int SendNum { get; set; }
+ }
}
--
Gitblit v1.9.3