From c564a4e259f2bb54b07ee2a883ebd0d32cf90700 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 09:56:41 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj | 1
LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw | 0
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/EnumType/WMS/UpiStatusEnum.cs | 57 ++++++++++++++++++++++++++++
LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs | 10 ++++-
4 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
index 2ac9750..528d7b8 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/WindowsFormsApplication1/Form1.cs
@@ -325,8 +325,14 @@
data.Add("Info13", item.Info13 ?? "");//褰撳墠鍖呴潰绉�
data.Add("printTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
- //mycontext.mes
- data.Add("leijisaomiaomj", item.Info13 ?? "");//绱鎵弿闈㈢Н
+ var finsiList = mycontext.mes_package_gather.Where(x => x.Info5 == item.Info5 && x.UpiStatus >= (int)UpiStatusEnum.宸插悎鍖�);
+ double leijisaomiaomj = 0;
+ foreach (var aa in finsiList)
+ {
+ leijisaomiaomj += Convert.ToDouble(aa.Info13);
+ }
+ leijisaomiaomj += Convert.ToDouble(item.Info13);
+ data.Add("leijisaomiaomj", leijisaomiaomj);//绱鎵弿闈㈢Н
//鏌ヨ涓� 鍖呮暟鎹�
var mylist = mycontext.mes_batchOrderUPI_new.Where(x => x.PackageCode == item.PackageCode).ToList();
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/EnumType/WMS/UpiStatusEnum.cs b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/EnumType/WMS/UpiStatusEnum.cs
new file mode 100644
index 0000000..33366a5
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/EnumType/WMS/UpiStatusEnum.cs
@@ -0,0 +1,57 @@
+锘�
+
+using System.ComponentModel;
+
+namespace Admin.NET.Application {
+
+/// <summary>
+/// 鏉挎枡鐘舵�佹灇涓�
+/// </summary>
+[Description("鏉挎枡鐘舵�佹灇涓�")]
+public enum UpiStatusEnum
+{
+ /// <summary>
+ /// 鍒濆
+ /// </summary>
+ [Description("鍒濆")]
+ 鍒濆 = 0,
+
+ /// <summary>
+ /// 涓嶉綈鍖�
+ /// </summary>
+ [Description("涓嶉綈鍖�")]
+ 涓嶉綈鍖� = 1,
+
+ /// <summary>
+ /// 宸查綈鍖�
+ /// </summary>
+ [Description("宸查綈鍖�")]
+ 宸查綈鍖� = 2,
+
+ /// <summary>
+ /// 鐮佸灈涓�
+ /// </summary>
+ [Description("鐮佸灈涓�")]
+ 鐮佸灈涓� = 3,
+
+
+ /// <summary>
+ /// 宸茬爜鍨�
+ /// </summary>
+ [Description("宸茬爜鍨�")]
+ 宸茬爜鍨� = 4,
+
+ /// <summary>
+ /// 宸插悎鍖�
+ /// </summary>
+ [Description("宸插悎鍖�")]
+ 宸插悎鍖� = 5,
+
+ /// <summary>
+ /// 宸蹭笅绾�
+ /// </summary>
+ [Description("宸蹭笅绾�")]
+ 宸蹭笅绾� = 6
+
+ }
+}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj
index 88b68e8..05a2f7a 100644
--- a/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj
+++ b/LA24030_LuLiPackageLine_Print/LA24030_LuLiPackageLine_PrintService/iWareModel/iWareModel.csproj
@@ -126,6 +126,7 @@
<Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
<Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
<Compile Include="EnumType\WMS\SysDictDataEnum.cs" />
+ <Compile Include="EnumType\WMS\UpiStatusEnum.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Struct\WmsStorageType.cs" />
<Compile Include="Struct\WmsCarrierType.cs" />
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
index e0977a0..f6b1651 100644
--- "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ
--
Gitblit v1.9.3