From 9ac99af38d377e24fa0e1298a118212974592321 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 11:04:24 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/WmsTask/PrintHandler.cs | 28 +++++++-------
CC/iWareSql/WmsDBModel/wms_record_print.cs | 73 +++++++++++++-----------------------
CC/iWareSql/iWareSql.csproj | 4 +
CC/iWareSql/WmsDBModel/WmsDBModel.cs | 4 -
4 files changed, 44 insertions(+), 65 deletions(-)
diff --git a/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs b/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs
index 22381c2..de45228 100644
--- a/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs
+++ b/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs
@@ -94,23 +94,23 @@
//璁剧疆鎵撳嵃鏈猴紝娉ㄦ剰锛氳繖閲屽彧鑾峰彇绗竴涓紝浠ュ悗鍙兘瑕佹敼锛�
_PrinterName = printConfig.PrinterList.Split(',')[0];
//鏍规嵁閰嶇疆鍚嶅瓧鏌ヨ 鎵撳嵃鏈哄悕瀛�
- var printConfigData = mycontext.SysDictData.Where(x => x.Name == _PrinterName).FirstOrDefault();
- if (printConfigData == null)
- {
- errMsg = $"娌℃湁鎵惧埌{_PrinterName.ToString()}鐨勬墦鍗版満鍚嶅瓧锛�";
- return;
- }
- _PrinterName = printConfigData.Value;
+ //var printConfigData = mycontext.SysDictData.Where(x => x.Name == _PrinterName).FirstOrDefault();
+ //if (printConfigData == null)
+ //{
+ // errMsg = $"娌℃湁鎵惧埌{_PrinterName.ToString()}鐨勬墦鍗版満鍚嶅瓧锛�";
+ // return;
+ //}
+ //_PrinterName = printConfigData.Value;
Dictionary<string, object> data = new Dictionary<string, object>();
if (printClassifyEnum == PrintClassifyEnum.鍖呰鏉＄爜)
{
- data.Add("bar", item.SNCode);
- data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
- data.Add("supplier", item.SupplierName ?? "");
- data.Add("unit", item.MaterialUnit ?? "");
- data.Add("qty", item.Quantity);
- data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ //data.Add("bar", item.SNCode);
+ //data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
+ //data.Add("supplier", item.SupplierName ?? "");
+ //data.Add("unit", item.MaterialUnit ?? "");
+ //data.Add("qty", item.Quantity);
+ //data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
}
else
{
@@ -135,7 +135,7 @@
}
else
{
- errMsg = $"鎵撳嵃閿欒,璺熻釜鐮亄item.SNCode}锛屾墦鍗版満鍚嶇О{_PrinterName},閿欒淇℃伅锛�(鎵撳嵃鏈嶅姟杩斿洖)" + errMsg;
+ errMsg = $"鎵撳嵃閿欒 鎵撳嵃鏈哄悕绉皗_PrinterName},閿欒淇℃伅锛�(鎵撳嵃鏈嶅姟杩斿洖)" + errMsg;
Log4NetHelper.WriteErrorLog(LogType.PrintHandler, errMsg, null);
return;
}
diff --git a/CC/iWareSql/WmsDBModel/WmsDBModel.cs b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
index 20c8836..8ea319a 100644
--- a/CC/iWareSql/WmsDBModel/WmsDBModel.cs
+++ b/CC/iWareSql/WmsDBModel/WmsDBModel.cs
@@ -150,9 +150,7 @@
.Property(e => e.Height)
.HasPrecision(10, 3);
- modelBuilder.Entity<wms_record_print>()
- .Property(e => e.Quantity)
- .HasPrecision(10, 3);
+
modelBuilder.Entity<wms_record_trans>()
.Property(e => e.SourceQuantity)
diff --git a/CC/iWareSql/WmsDBModel/wms_record_print.cs b/CC/iWareSql/WmsDBModel/wms_record_print.cs
index 6558049..177b9a6 100644
--- a/CC/iWareSql/WmsDBModel/wms_record_print.cs
+++ b/CC/iWareSql/WmsDBModel/wms_record_print.cs
@@ -16,67 +16,46 @@
public int PrintSource { get; set; }
[Required]
- [StringLength(255)]
- public string SNCode { get; set; }
-
- [Required]
[StringLength(50)]
- public string MaterialCode { get; set; }
+ public string PackageCode { get; set; }
- [Required]
- [StringLength(50)]
- public string MaterialName { get; set; }
+ [StringLength(60)]
+ public string Info4 { get; set; }
- [StringLength(50)]
- public string SupplierCode { get; set; }
+ [StringLength(60)]
+ public string Info5 { get; set; }
- [StringLength(50)]
- public string SupplierName { get; set; }
+ [StringLength(60)]
+ public string Info6 { get; set; }
- [Required]
- [StringLength(50)]
- public string MaterialUnit { get; set; }
+ [StringLength(60)]
+ public string Info7 { get; set; }
- [StringLength(50)]
- public string POUnit { get; set; }
+ [StringLength(60)]
+ public string Info8 { get; set; }
- public decimal Quantity { get; set; }
+ [StringLength(60)]
+ public string Info10 { get; set; }
- [StringLength(50)]
- public string OrderNo { get; set; }
+ [StringLength(60)]
+ public string Info9 { get; set; }
- [StringLength(50)]
- public string RelationNo { get; set; }
+ [StringLength(60)]
+ public string Info11 { get; set; }
- [StringLength(50)]
- public string OrderNoLineNumber { get; set; }
+ [StringLength(60)]
+ public string Info12 { get; set; }
- [StringLength(50)]
- public string RelationNoLineNumber { get; set; }
+ [StringLength(60)]
+ public string Info13 { get; set; }
- [StringLength(50)]
- public string PlaceCode { get; set; }
+ [StringLength(60)]
+ public string Info14 { get; set; }
- [StringLength(50)]
- public string PlaceName { get; set; }
+ public int? Info15 { get; set; }
- [StringLength(50)]
- public string ToAreaCode { get; set; }
-
- [StringLength(50)]
- public string ToAreaName { get; set; }
-
- [StringLength(50)]
- public string ToPlaceCode { get; set; }
-
- [StringLength(50)]
- public string ToPlaceName { get; set; }
-
- [StringLength(50)]
- public string SourceAreaCode { get; set; }
-
- [StringLength(50)]
- public string SourceAreaName { get; set; }
+ [StringLength(60)]
+ public string Info16 { get; set; }
public int PrintSheetNum { get; set; }
diff --git a/CC/iWareSql/iWareSql.csproj b/CC/iWareSql/iWareSql.csproj
index a01c0ec..a98b3f6 100644
--- a/CC/iWareSql/iWareSql.csproj
+++ b/CC/iWareSql/iWareSql.csproj
@@ -254,6 +254,8 @@
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <Folder Include="TestDemo\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.3