diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs
index 5cd7de3..53563c3 100644
--- a/Epost.BLL/OrderBLL.cs
+++ b/Epost.BLL/OrderBLL.cs
@@ -940,17 +940,20 @@ namespace Epost.BLL
return dal.IsFinishWorkByCar(endcount, matchid, block);
}
- public bool UpdateStateByCar(string matchid, string area,string block = "", string sku = "")
+ public bool UpdateStateByCar(string matchid, string sku = "")
{
- return dal.UpdateStateByCar(matchid,area, block, sku);
+ return dal.UpdateStateByCar(matchid, sku);
}
public bool IsFinishWork(int endcount, string block, string usercode = "", string area = "", string sku = "", string shopid = "", string matchid = "")
{
return dal.IsFinishWork(endcount, block, usercode, area, sku, shopid, matchid);
}
-
+ public bool IsSkuFinishWork(string sku, string matchid)
+ {
+ return dal.IsSkuFinishWork(sku, matchid);
+ }
public DataTable GetMatchOrder()
{
return dal.GetMatchOrder();
diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs
index 89bbd59..8eb7581 100644
--- a/Epost.BLL/Work_JobDownThread.cs
+++ b/Epost.BLL/Work_JobDownThread.cs
@@ -297,7 +297,7 @@ namespace Epost.BLL
//if (blockfinish)
//{
// #region 点亮显示器
-
+
// show.Title = "当前波次分播完成";
// show.Contents = "拍下熄灭所有设备\r请扫描继续作业";
// show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Green);
@@ -306,7 +306,7 @@ namespace Epost.BLL
// show.Block = block;
// show.Islock = false;
// show.IsTwinkle = 1;
-
+
// comBLL.ShowBoxMessage_M(show);
// #endregion
@@ -322,8 +322,13 @@ namespace Epost.BLL
//}
#endregion
- #region 区内sku播完回传
- orderbll.UpdateStateByCar(model.Matchid,area, block, model.Sku);
+ #region sku播完回传
+ bool skubo = orderbll.IsSkuFinishWork(model.Sku, model.Matchid);
+ if (skubo)
+ {
+ LogHelper.WriteLogInfo(model.Sku + "Sku播种完成" + model.Matchid);
+ orderbll.UpdateStateByCar(model.Matchid, model.Sku);
+ }
#endregion
#region 清除当前区已做完的sku
diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs
index a7c8819..bd85f14 100644
--- a/Epost.DAL/OrdersDAL.cs
+++ b/Epost.DAL/OrdersDAL.cs
@@ -717,19 +717,12 @@ namespace Epost.DAL
#endregion
#region 修改当前小车拣货状态
- public bool UpdateStateByCar(string matchid,string area, string block = "", string sku = "")
+ public bool UpdateStateByCar(string matchid, string sku = "")
{
try
{
string strwhere = string.Empty;
- if (!string.IsNullOrEmpty(block))
- {
- strwhere += " and block='" + block + "'";
- }
- if (!string.IsNullOrEmpty(sku))
- {
- strwhere += " and area='" + area + "'";
- }
+
if (!string.IsNullOrEmpty(sku))
{
strwhere += " and sku='" + sku + "'";
@@ -1091,6 +1084,38 @@ namespace Epost.DAL
}
#endregion
+
+ #region 判断当前sku是否为已完成
+ public bool IsSkuFinishWork( string sku , string matchid )
+ {
+ string strwheres = "";
+
+ if (!string.IsNullOrEmpty(matchid))
+ {
+ strwheres += " and matchid ='" + matchid + "'";
+ }
+ if (!string.IsNullOrEmpty(sku))
+ {
+ strwheres += " and sku ='" + sku + "'";
+ }
+ string sql = "select matchid, sku from V_orders where oprationstate <> 3 and state<>99 " + strwheres;
+
+ LogHelper.WriteLogInfo("判断sku是否为已完成" + sql);
+ DataTable dt = db.GetsqlForDT(sql);
+ if (dt == null || dt.Rows.Count == 0)
+ {
+ LogHelper.WriteLogInfo("判断sku是否为已完成true");
+ return true;
+
+ }
+ else
+ {
+ LogHelper.WriteLogInfo("判断sku是否为已完成false");
+ return false;
+ }
+ }
+ #endregion
+
#region 查询下一区段区号
public int getOrderarea(string usercode, string block, string area)
{
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index 2eaafac..4d10158 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
False
600
E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml
- Debug|Any CPU
+ Release|Any CPU
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 20a3d0f..ef98cf8 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,7 @@
<_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS
- True|2024-12-19T07:11:44.2536385Z;True|2024-12-10T19:10:26.6514077+08:00;True|2024-12-10T18:30:34.7211512+08:00;True|2024-12-09T14:06:46.4112259+08:00;True|2024-12-03T14:23:26.2134334+08:00;True|2024-11-27T18:53:48.7373661+08:00;True|2024-11-27T14:27:33.0840789+08:00;True|2024-11-27T14:08:15.6442660+08:00;True|2024-11-27T12:10:03.9412549+08:00;True|2024-11-27T11:45:31.3775097+08:00;True|2024-11-27T11:32:00.8297320+08:00;True|2024-11-23T20:50:04.5476409+08:00;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;
+ True|2025-01-16T07:37:40.8814043Z;True|2024-12-19T15:11:44.2536385+08:00;True|2024-12-10T19:10:26.6514077+08:00;True|2024-12-10T18:30:34.7211512+08:00;True|2024-12-09T14:06:46.4112259+08:00;True|2024-12-03T14:23:26.2134334+08:00;True|2024-11-27T18:53:48.7373661+08:00;True|2024-11-27T14:27:33.0840789+08:00;True|2024-11-27T14:08:15.6442660+08:00;True|2024-11-27T12:10:03.9412549+08:00;True|2024-11-27T11:45:31.3775097+08:00;True|2024-11-27T11:32:00.8297320+08:00;True|2024-11-23T20:50:04.5476409+08:00;False|2024-11-04T17:48:25.2781696+08:00;True|2024-11-01T16:04:56.3535724+08:00;True|2024-09-01T10:13:37.1598955+08:00;True|2024-08-31T17:27:57.5375469+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;
@@ -33,19 +33,19 @@
04/04/2018 15:45:12
- 12/19/2024 15:11:40
+ 01/16/2025 15:49:24
- 12/19/2024 15:11:40
+ 01/16/2025 15:49:24
02/24/2020 15:29:24
- 12/19/2024 15:11:21
+ 01/16/2025 15:37:17
- 12/19/2024 15:11:21
+ 01/16/2025 15:37:17
04/29/2020 16:50:14
@@ -63,31 +63,31 @@
10/23/2017 13:15:20
- 12/19/2024 15:11:22
+ 01/16/2025 15:37:18
- 12/19/2024 15:11:22
+ 01/16/2025 15:37:18
08/26/2020 18:09:48
- 12/19/2024 15:11:21
+ 01/16/2025 15:37:17
- 12/19/2024 15:11:21
+ 01/16/2025 15:37:17
- 12/19/2024 15:11:24
+ 01/16/2025 15:37:21
- 12/19/2024 15:11:24
+ 01/16/2025 15:37:21
- 12/12/2024 18:31:48
+ 01/16/2025 15:37:16
- 12/12/2024 18:31:48
+ 01/16/2025 15:37:16
09/06/2018 11:57:11
@@ -5652,7 +5652,7 @@
05/30/2022 16:58:47
- 12/19/2024 15:11:26
+ 01/16/2025 15:49:18
04/04/2018 15:45:12
@@ -7572,7 +7572,7 @@
07/04/2022 14:22:38
- 12/12/2024 18:31:53
+ 01/16/2025 15:37:22
\ No newline at end of file