From 19718e4a5dc6312173d4f44e630f50df2ee4f5b7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 27 11月 2024 17:31:00 +0800
Subject: [PATCH] 222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs | 1
/dev/null | 365 ----------------------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs | 128 +++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs | 128 +++++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs | 27 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs | 128 +++++++++
6 files changed, 408 insertions(+), 369 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
index c79fdd4..c3a8126 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Const/ApplicationConst.cs
@@ -63,6 +63,7 @@
public const string printCenterGroupName = "鎵撳嵃涓績";
public const string ThirdInterFaceServiceGroupName = "绗笁鏂规湇鍔℃帴鍙ｇ鐞�";
+ public const string ThirdInterFaceGroupName = "绗笁鏂规湇鍔℃帴鍙ｇ鐞�2";
}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
new file mode 100644
index 0000000..8ca808c
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_Gather.cs
@@ -0,0 +1,128 @@
+锘縰sing Admin.NET.Core;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/5/29涓婂崍10:26:39
+ * @desc : 璋冨害浠诲姟
+ */
+namespace Admin.NET.Application.Entity
+{
+ /// <summary>
+ /// 鍖呮眹鎬绘暟鎹�
+ /// </summary>
+ [SugarTable("mes_package_gather", "鍖呮眹鎬绘暟鎹�")]
+ public class Mes_Package_Gather : EntityBase
+ {
+
+ [Required]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
+
+
+ #region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆�
+
+ /// <summary>
+ /// 鎵�鍦ㄥ尯鍩�
+ /// </summary>
+ [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "鎵�鍦ㄥ尯鍩�")]
+ public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.鏃犲尯鍩�;
+
+
+ /// <summary>
+ /// 鏉挎枡鐘舵��
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
+ public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
+
+ #endregion
+
+
+ #region 鍖呰绾挎湁鍏�
+
+ [Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+
+
+ #endregion
+
+
+
+ [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
+ public float? Info1 { get; set; }
+
+ [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
+ public float? Info2 { get; set; }
+
+ [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
+ public float? Info3 { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
+ public string? Info4 { get; set; }
+
+
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
+ public string? Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
+ public string? Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
+ public string? Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
+ public string? Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ public string? Info13 { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs
new file mode 100644
index 0000000..6cbd4c4
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_LineQueue.cs
@@ -0,0 +1,128 @@
+锘縰sing Admin.NET.Core;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/5/29涓婂崍10:26:39
+ * @desc : 璋冨害浠诲姟
+ */
+namespace Admin.NET.Application.Entity
+{
+ /// <summary>
+ /// 鍖呬骇绾块槦鍒楁暟鎹�
+ /// </summary>
+ [SugarTable("mes_package_linequeue", "鍖呬骇绾块槦鍒楁暟鎹�")]
+ public class Mes_Package_LineQueue : EntityBase
+ {
+
+ [Required]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
+
+
+ #region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆�
+
+ /// <summary>
+ /// 鎵�鍦ㄥ尯鍩�
+ /// </summary>
+ [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "鎵�鍦ㄥ尯鍩�")]
+ public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.鏃犲尯鍩�;
+
+
+ /// <summary>
+ /// 鏉挎枡鐘舵��
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
+ public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
+
+ #endregion
+
+
+ #region 鍖呰绾挎湁鍏�
+
+ [Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+
+
+ #endregion
+
+
+
+ [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
+ public float? Info1 { get; set; }
+
+ [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
+ public float? Info2 { get; set; }
+
+ [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
+ public float? Info3 { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
+ public string? Info4 { get; set; }
+
+
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
+ public string? Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
+ public string? Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
+ public string? Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
+ public string? Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ public string? Info13 { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs
new file mode 100644
index 0000000..9d1e338
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_Package_UnLine_Record.cs
@@ -0,0 +1,128 @@
+锘縰sing Admin.NET.Core;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/5/29涓婂崍10:26:39
+ * @desc : 璋冨害浠诲姟
+ */
+namespace Admin.NET.Application.Entity
+{
+ /// <summary>
+ /// 鍖呬骇绾夸笅绾胯褰曟暟鎹�
+ /// </summary>
+ [SugarTable("mes_package_unline_record", "鍖呬骇绾夸笅绾胯褰曟暟鎹�")]
+ public class Mes_Package_UnLine_Record : EntityBase
+ {
+
+ [Required]
+ [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
+ public string PlanNo { get; set; }
+
+ [Required]
+ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
+
+
+ #region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆�
+
+ /// <summary>
+ /// 鎵�鍦ㄥ尯鍩�
+ /// </summary>
+ [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "鎵�鍦ㄥ尯鍩�")]
+ public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.鏃犲尯鍩�;
+
+
+ /// <summary>
+ /// 鏉挎枡鐘舵��
+ /// </summary>
+ [Required]
+ [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")]
+ public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆;
+
+ #endregion
+
+
+ #region 鍖呰绾挎湁鍏�
+
+ [Required]
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
+
+
+
+ #endregion
+
+
+
+ [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
+ public float? Info1 { get; set; }
+
+ [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
+ public float? Info2 { get; set; }
+
+ [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
+ public float? Info3 { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
+ public string? Info4 { get; set; }
+
+
+
+ /// <summary>
+ /// 绗嚑鍖�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
+ public string? Info6 { get; set; }
+
+ /// <summary>
+ /// 缁忛攢搴楀悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
+ public string? Info7 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
+ public string? Info8 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
+ public string? Info10 { get; set; }
+
+ /// <summary>
+ /// 鍖呰缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
+ public string? Info9 { get; set; }
+
+ /// <summary>
+ /// 鑷彁or鍙戣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
+ public string? Info11 { get; set; }
+
+ /// <summary>
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ public string? Info12 { get; set; }
+
+ /// <summary>
+ /// 鍖呰闈㈢Н
+ /// </summary>
+ [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ public string? Info13 { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
index 89d4870..ed7aa55 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
@@ -15,9 +15,13 @@
public class ThirdInterFaceService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _rep;
- public ThirdInterFaceService(SqlSugarRepository<Mes_BatchOrderUPI_New> rep)
+ private readonly SqlSugarRepository<Mes_Package_Gather> _mes_Package_Gather_Rep;
+ public ThirdInterFaceService(SqlSugarRepository<Mes_BatchOrderUPI_New> rep,
+ SqlSugarRepository<Mes_Package_Gather> mes_Package_Gather_Rep
+ )
{
_rep = rep;
+ _mes_Package_Gather_Rep = mes_Package_Gather_Rep;
}
[HttpPost]
@@ -41,18 +45,33 @@
throw Oops.Oh("鏈鏈夐噸澶嶇殑UPI锛侀噸澶嶅彿涓�:" + dit.Key + ",閲嶅鏉℃暟:" + dit.Value);
}
- List<string> upis = new List<string>();
- input.ForEach(x => upis.Add(x.UPI));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
+ List<string> packageList = new List<string>();
+ input.ForEach(x => packageList.Add(x.PackageCode));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
- var batchOrderUPIs = await _rep.AsQueryable().Where(x => upis.Contains(x.UPI)).ToListAsync();//batchOrderUPIs鏄噸澶嶇殑upi闆嗗悎
+ var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PackageCode)).ToListAsync();//batchOrderUPIs鏄噸澶嶇殑upi闆嗗悎
//鎵归噺鍒犻櫎
await _rep.DeleteAsync(batchOrderUPIs);
+
+ //鎵归噺鍒犻櫎
+ await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PackageCode));
foreach (var item in input)
{
item.AreaCode = AreaCodeEnum.鏃犲尯鍩�;
item.UpiStatus = UpiStatusEnum.鍒濆;
}
+ List<Mes_Package_Gather> addGatherList = new List<Mes_Package_Gather>();
+ var groups = input.GroupBy(x => x.PackageCode);
+ foreach (var group in groups)
+ {
+ var first = group.ToList().First();
+ Mes_Package_Gather newGather = first.Adapt<Mes_Package_Gather>();
+ newGather.AreaCode = AreaCodeEnum.鏃犲尯鍩�;
+ newGather.UpiStatus = UpiStatusEnum.鍒濆;
+ addGatherList.Add(newGather);
+ }
+ await _mes_Package_Gather_Rep.InsertRangeAsync(addGatherList);
+
await _rep.InsertRangeAsync(input);
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
deleted file mode 100644
index ef29454..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-锘縰sing Admin.NET.Core;
-using Admin.NET.Core.Enum;
-using System.ComponentModel.DataAnnotations;
-
-namespace Admin.NET.Application;
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙峰熀纭�杈撳叆鍙傛暟
- /// </summary>
- public class MesPushPackageCodeBaseInput
- {
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- public virtual string PackageCode { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public virtual int PushStatus { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佹鏁�
- /// </summary>
- public virtual int PushNum { get; set; }
-
- /// <summary>
- /// 鎺ュ彛杩斿洖鍙傛暟
- /// </summary>
- public virtual string ApiMessage { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public virtual DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- public virtual DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜篒d
- /// </summary>
- public virtual long? CreateUserId { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public virtual string CreateUserName { get; set; }
-
- /// <summary>
- /// 淇敼浜篒d
- /// </summary>
- public virtual long? UpdateUserId { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public virtual string UpdateUserName { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public virtual long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public virtual string CreateOrgName { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- public virtual bool IsDelete { get; set; }
-
- }
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙峰垎椤垫煡璇㈣緭鍏ュ弬鏁�
- /// </summary>
- public class MesPushPackageCodeInput : BasePageInput
- {
- /// <summary>
- /// 鍏抽敭瀛楁煡璇�
- /// </summary>
- public string? SearchKey { get; set; }
-
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- public string? PackageCode { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public PushStatusEnum? PushStatus { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佹鏁�
- /// </summary>
- public int? PushNum { get; set; }
-
- /// <summary>
- /// 鎺ュ彛杩斿洖鍙傛暟
- /// </summary>
- public string? ApiMessage { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public string? CreateOrgName { get; set; }
-
- }
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙峰鍔犺緭鍏ュ弬鏁�
- /// </summary>
- public class AddMesPushPackageCodeInput : MesPushPackageCodeBaseInput
- {
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- [Required(ErrorMessage = "鍖呰鍙蜂笉鑳戒负绌�")]
- public override string PackageCode { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- [Required(ErrorMessage = "鎺ㄩ�佺姸鎬佷笉鑳戒负绌�")]
- public override int PushStatus { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佹鏁�
- /// </summary>
- [Required(ErrorMessage = "鎺ㄩ�佹鏁颁笉鑳戒负绌�")]
- public override int PushNum { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- [Required(ErrorMessage = "杞垹闄や笉鑳戒负绌�")]
- public override bool IsDelete { get; set; }
-
- }
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙峰垹闄よ緭鍏ュ弬鏁�
- /// </summary>
- public class DeleteMesPushPackageCodeInput : BaseIdInput
- {
- }
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙锋洿鏂拌緭鍏ュ弬鏁�
- /// </summary>
- public class UpdateMesPushPackageCodeInput : AddMesPushPackageCodeInput
- {
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- [Required(ErrorMessage = "涓婚敭Id涓嶈兘涓虹┖")]
- public long Id { get; set; }
-
- }
-
- /// <summary>
- /// 鎺ㄩ�乵es鍖呰鍙蜂富閿煡璇㈣緭鍏ュ弬鏁�
- /// </summary>
- public class QueryByIdMesPushPackageCodeInput : DeleteMesPushPackageCodeInput
- {
-
- }
-public class PushPackageCodeInput
-{
- public string PackageCode { get; set; }
-}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
deleted file mode 100644
index e0a7fe2..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-锘縩amespace Admin.NET.Application;
-
-/// <summary>
-/// 鎺ㄩ�乵es鍖呰鍙疯緭鍑哄弬鏁�
-/// </summary>
-public class MesPushPackageCodeOutput
-{
- /// <summary>
- /// 涓婚敭Id
- /// </summary>
- public long? Id { get; set; }
-
- /// <summary>
- /// 鍖呰鍙�
- /// </summary>
- public string PackageCode { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public int PushStatus { get; set; }
-
- /// <summary>
- /// 鎺ㄩ�佹鏁�
- /// </summary>
- public int PushNum { get; set; }
-
- /// <summary>
- /// 鎺ュ彛杩斿洖鍙傛暟
- /// </summary>
- public string ApiMessage { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- public DateTime? UpdateTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜篒d
- /// </summary>
- public long? CreateUserId { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateUserName { get; set; }
-
- /// <summary>
- /// 淇敼浜篒d
- /// </summary>
- public long? UpdateUserId { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public string UpdateUserName { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂↖d
- /// </summary>
- public long? CreateOrgId { get; set; }
-
- /// <summary>
- /// 鍒涘缓鑰呴儴闂ㄥ悕绉�
- /// </summary>
- public string CreateOrgName { get; set; }
-
- /// <summary>
- /// 杞垹闄�
- /// </summary>
- public bool IsDelete { get; set; }
-
- }
-public class Respone
-{
- public int iState;
- public string message;
- public object result;
-
-}
-
-
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
deleted file mode 100644
index 45aebbb..0000000
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/MesPushPackageCode/MesPushPackageCodeService.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-锘縰sing Admin.NET.Core.Service;
-using Admin.NET.Application.Entity;
-using Microsoft.AspNetCore.Http;
-using System.Data;
-using System.Web;
-using System.Text;
-using Furion.DatabaseAccessor;
-using Admin.NET.Core.Enum;
-using Furion.RemoteRequest.Extensions;
-using StackExchange.Profiling.Internal;
-
-namespace Admin.NET.Application;
-/// <summary>
-/// 鎺ㄩ�乵es鍖呰鍙锋湇鍔�
-/// </summary>
-[ApiDescriptionSettings(ApplicationConst.WmsOrderGroupName, Order = 100)]
-public class MesPushPackageCodeService : IDynamicApiController, ITransient
-{
- private readonly SqlSugarRepository<MesPushPackageCode> _rep;
- public MesPushPackageCodeService(SqlSugarRepository<MesPushPackageCode> rep)
- {
- _rep = rep;
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ鎺ㄩ�乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "Page")]
- [Description("MesPushPackageCode/Page")]
- public async Task<SqlSugarPagedList<MesPushPackageCodeOutput>> Page(MesPushPackageCodeInput input)
- {
- var query = CommonPageFilter(input);
- return await query.OrderBuilder(input, "", "Id").ToPagedListAsync(input.Page, input.PageSize);
- }
-
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈡帹閫乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "List")]
- [Description("MesPushPackageCode/List")]
- public async Task<List<MesPushPackageCodeOutput>> List([FromQuery] MesPushPackageCodeInput input)
- {
- var query = CommonPageFilter(input);
- return await query.OrderBuilder(input, "", "Id").Select<MesPushPackageCodeOutput>().ToListAsync();
- }
-
- /// <summary>
- /// 澧炲姞鎺ㄩ�乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "Add")]
- [Description("MesPushPackageCode/Add")]
- public async Task<long> Add(AddMesPushPackageCodeInput input)
- {
- var entity = input.Adapt<MesPushPackageCode>();
-
- //閲嶅鎬ч獙璇�
- await CheckExist(entity);
-
- await _rep.InsertAsync(entity);
- return entity.Id;
- }
-
- /// <summary>
- /// 鍒犻櫎鎺ㄩ�乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "Delete")]
- [Description("MesPushPackageCode/Delete")]
- public async Task Delete(DeleteMesPushPackageCodeInput input)
- {
- var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
- //await _rep.FakeDeleteAsync(entity); //鍋囧垹闄�
- await _rep.DeleteAsync(entity); //鐪熷垹闄�
- }
-
- /// <summary>
- /// 鏇存柊鎺ㄩ�乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "Update")]
- [Description("MesPushPackageCode/Update")]
- public async Task Update(UpdateMesPushPackageCodeInput input)
- {
- var entity = input.Adapt<MesPushPackageCode>();
-
- //閲嶅鎬ч獙璇�
- await CheckExist(entity, true);
-
- await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
- }
-
- /// <summary>
- /// 鑾峰彇鎺ㄩ�乵es鍖呰鍙�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "Detail")]
- [Description("MesPushPackageCode/Detail")]
- public async Task<MesPushPackageCode> Detail([FromQuery] QueryByIdMesPushPackageCodeInput input)
- {
- return await _rep.GetFirstAsync(u => u.Id == input.Id);
- }
-
-
- [HttpPost]
- [ApiDescriptionSettings(Name = "PushPackageCode")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task PushPackageCode(PushPackageCodeInput input)
- {
- var value = await _rep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
- if (value == null) throw Oops.Oh("鍖呰鍙蜂笉瀛樺湪");
- if (value.PushStatus != PushStatusEnum.NotPush || value.PushStatus != PushStatusEnum.Pushing) throw Oops.Oh("閲嶅鎺ㄩ��");
- string url = "http://localhost:8088/api/getwmstask/getwmstask";
- var respon = await url.SetHttpMethod(HttpMethod.Post).SetBody(input).PostAsStringAsync();
- var data = respon.FromJson<Respone>();
- if (data.iState == 1)
- {
- value.PushStatus = PushStatusEnum.PushSuccess;
- value.ApiMessage = data.message;
- value.PushNum++;
- }
- else
- {
- value.PushStatus = PushStatusEnum.Pushing;
- value.ApiMessage = data.message;
- value.PushNum++;
- if (value.PushNum == 3)
- {
- value.PushStatus = PushStatusEnum.PushFail;
- }
- }
- await _rep.UpdateAsync(value);
- }
-
-
- #region 瀵煎叆
-
- /// <summary>
- /// Excel妯℃澘瀵煎叆鎺ㄩ�乵es鍖呰鍙峰姛鑳�
- /// </summary>
- /// <param name="file">Excel妯℃澘鏂囦欢</param>
- /// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [HttpPost]
- [ApiDescriptionSettings(Name = "ImportExcel")]
- [Description("MesPushPackageCode/ImportExcel")]
- public async Task<int> ImportExcelAsync(IFormFile file)
- {
- int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
- int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
- DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList = await CommonImport(importDataTable, _DataStartLine);
- await _rep.InsertRangeAsync(addList);
- return addList.Count;
- }
-
- /// <summary>
- /// DataTable杞崲瀹炰綋瀵硅薄鍒楄〃
- /// </summary>
- /// <param name="dataTable"></param>
- /// <param name="dataStartLine">妯＄増鍒楀悕寮�濮嬭</param>
- /// <returns></returns>
- private async Task<List<MesPushPackageCode>> CommonImport(DataTable dataTable, int dataStartLine)
- {
- var details = new List<MesPushPackageCode>();
- int index = dataStartLine;//妯＄増鍒楀悕寮�濮嬭
- foreach (System.Data.DataRow row in dataTable.Rows)
- {
- index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new MesPushPackageCode();
- #region 瀹氫箟鍙橀噺
- var _PackageCode = "";//鍖呰鍙�
- var _PushStatus = "";//鎺ㄩ�佺姸鎬�
- var _PushNum = "";//鎺ㄩ�佹鏁�
- var _ApiMessage = "";//鎺ュ彛杩斿洖鍙傛暟
- var _CreateOrgName = "";//鍒涘缓鑰呴儴闂ㄥ悕绉�
- #endregion
-
-
- #region 鍙栧��
- _PackageCode = row["鍖呰鍙�"]?.ToString();
- _PushStatus = row["鎺ㄩ�佺姸鎬�"]?.ToString();
- _PushNum = row["鎺ㄩ�佹鏁�"]?.ToString();
- _ApiMessage = row["鎺ュ彛杩斿洖鍙傛暟"]?.ToString();
- _CreateOrgName = row["鍒涘缓鑰呴儴闂ㄥ悕绉�"]?.ToString();
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_PackageCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鍖呰鍙穄{_PackageCode}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PackageCode))
- {
- addItem.PackageCode = (string)(_PackageCode.Trim());
- }
-
- if (string.IsNullOrEmpty(_PushStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佺姸鎬乚{_PushStatus}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PushStatus))
- {
- if (!int.TryParse(_PushStatus, out int outPushStatus) && !string.IsNullOrEmpty(_PushStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佺姸鎬乚{_PushStatus}鍊间笉姝ｇ‘锛�");
- }
- if (outPushStatus <= 0 && !string.IsNullOrEmpty(_PushStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佺姸鎬乚{_PushStatus}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
-
- }
-
- }
-
- if (string.IsNullOrEmpty(_PushNum))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佹鏁癩{_PushNum}涓嶈兘涓虹┖锛�");
- }
-
- if (!string.IsNullOrEmpty(_PushNum))
- {
- if (!int.TryParse(_PushNum, out int outPushNum) && !string.IsNullOrEmpty(_PushNum))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佹鏁癩{_PushNum}鍊间笉姝ｇ‘锛�");
- }
- if (outPushNum <= 0 && !string.IsNullOrEmpty(_PushNum))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺ㄩ�佹鏁癩{_PushNum}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.PushNum = outPushNum;
- }
-
- }
- if (!string.IsNullOrEmpty(_ApiMessage))
- {
- addItem.ApiMessage = (string)(_ApiMessage.Trim());
- }
- if (!string.IsNullOrEmpty(_CreateOrgName))
- {
- addItem.CreateOrgName = (string)(_CreateOrgName.Trim());
- }
- #endregion
-
-
- details.Add(addItem);
- }
- //楠岄噸
- await CheckExisitForImport(details);
- return details;
- }
-
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鎺ㄩ�乵es鍖呰鍙风殑Excel瀵煎叆妯℃澘
- /// </summary>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet]
- [ApiDescriptionSettings(Name = "DownloadExcelTemplate")]
- [Description("MesPushPackageCode/DownloadExcelTemplate")]
- public IActionResult DownloadExcelTemplate()
- {
- string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\鎺ㄩ�乵es鍖呰鍙穥TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鎺ㄩ�乵es鍖呰鍙�).xlsx", Encoding.GetEncoding("UTF-8"));
- return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
- }
-
- #endregion
-
- #region 绉佹湁鏂规硶
-
- /// <summary>
- /// 鍏叡鏌ヨ鎺ㄩ�乵es鍖呰鍙锋潯浠�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- private ISugarQueryable<MesPushPackageCodeOutput> CommonPageFilter(MesPushPackageCodeInput input)
- {
- var query = _rep.AsQueryable()
- .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
- u.PackageCode.Contains(input.SearchKey.Trim())
- || u.ApiMessage.Contains(input.SearchKey.Trim())
- || u.CreateUserName.Contains(input.SearchKey.Trim())
- || u.UpdateUserName.Contains(input.SearchKey.Trim())
- || u.CreateOrgName.Contains(input.SearchKey.Trim())
- )
- .WhereIF(!string.IsNullOrWhiteSpace(input.PackageCode), u => u.PackageCode.Contains(input.PackageCode.Trim()))
- .WhereIF(input.PushStatus > 0, u => u.PushStatus == input.PushStatus)
- .WhereIF(input.PushNum > 0, u => u.PushNum == input.PushNum)
- .WhereIF(!string.IsNullOrWhiteSpace(input.ApiMessage), u => u.ApiMessage.Contains(input.ApiMessage.Trim()))
- .WhereIF(!string.IsNullOrWhiteSpace(input.CreateOrgName), u => u.CreateOrgName.Contains(input.CreateOrgName.Trim()))
- .Select<MesPushPackageCodeOutput>();
- return query;
- }
-
- /// <summary>
- /// 閲嶅鎬ч獙璇�
- /// </summary>
- /// <param name="input">楠岃瘉瀵硅薄</param>
- /// <param name="isEdit">鏄惁鏄紪杈�</param>
- /// <returns></returns>
- private async Task CheckExist(MesPushPackageCode input, bool isEdit = false)
- {
-
-
-
- //娌℃湁閰嶇疆缁勫悎鏍￠獙锛屼笉闇�瑕侀獙閲�
-
-
- //娌℃湁閰嶇疆鍗曠嫭鏍￠獙锛屼笉闇�瑕侀獙閲�
- }
-
- /// <summary>
- /// 鏍规嵁缁勫悎鏍￠獙鍜屽崟鐙牎楠岄獙璇佹暟鎹槸鍚﹀凡瀛樺湪-瀵煎叆鏃堕獙璇�
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- private async Task CheckExisitForImport(List<MesPushPackageCode> inputs)
- {
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏍规嵁缁勫悎鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
-
-
-
-
-
- //鏍规嵁鍗曠嫭鏍￠獙楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
-
-
-
- }
- #endregion
-
-}
-
--
Gitblit v1.9.3