From 580dcaa522b417105c3cdbd9fcb078c404817492 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 02 二月 2021 15:15:48 +0800
Subject: [PATCH] 选单功能 bug
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 4 +-
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 115 ++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 605cba2..feda2e4 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -442,7 +442,7 @@
}
else
{
- LogHelper.Error(saveObj.ToString());
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏� 鏂板寮傚父锛�" + saveObj.ToString());
this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
}
}
@@ -473,8 +473,8 @@
}
else
{
+ LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏� 鏂板寮傚父锛�" + saveObj.ToString());
this.View.ShowMessage(saveObj["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString());
- this.View.ShowErrMessage(jsonRoot.ToString());
}
}
this.View.UpdateView();
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index be60f8d..4111a5b 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -507,6 +507,13 @@
}
else
{
+ //楠岃瘉鏃ヨ鍒掑伐鍗曟槸鍚﹀瓨鍦ㄦ暟鎹� 鐢熶骇璁㈠崟鍙峰姞鏄庣粏琛屽彿 宸茬敓鎴愯繃鏃ヨ鍒掔殑涓嶇敓鎴�
+ string moSql = string.Format(@"/*dialect*/ select FID from SC_WORKBILLSORTBILLMAIN
+ where FSCORDERNO ='{0}' and FSRCBILLENTRYSEQ = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ int fDayPlanFID = DBServiceHelper.ExecuteScalar<int>(Context, moSql, 0);
+ if (fDayPlanFID > 0)
+ continue;
+
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"
/*dialect*/
@@ -2981,59 +2988,73 @@
//鐢熶骇璁″垝骞冲彴閫夊崟 鐢熶骇璁㈠崟鏁版嵁
public void SelectMenu()
{
- //鑾峰彇鍗曟嵁浣撲俊鎭�
- Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
- //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
- DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
- int Fseq = entityDataObjoct.Count();
- //if (Fseq == 0)
- //{
- // this.View.ShowErrMessage("璇峰厛鍔犺浇鏁版嵁");
- // return;
- //}
-
- //var isexists = entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
- //var isexists1 = entityDataObjoct.ToList().FindAll(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
-
- string pageId = Guid.NewGuid().ToString();
- ListShowParameter showParameter = new ListShowParameter();
- showParameter.FormId = "PRD_MO";
- showParameter.PageId = pageId;
- showParameter.UseOrgId = this.Context.CurrentOrganizationInfo.ID;
- showParameter.IsLookUp = true;
- this.View.ShowForm(showParameter);
-
- this.View.ShowForm(showParameter, delegate (FormResult result)
+ try
{
- object returnData = result.ReturnData;
- if (returnData is ListSelectedRowCollection)
+ //鑾峰彇鍗曟嵁浣撲俊鎭�
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ int Fseq = entityDataObjoct.Count();
+ //if (Fseq == 0)
+ //{
+ // this.View.ShowErrMessage("璇峰厛鍔犺浇鏁版嵁");
+ // return;
+ //}
+ //var isexists = entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
+ //var isexists1 = entityDataObjoct.ToList().FindAll(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
+ string pageId = Guid.NewGuid().ToString();
+ ListShowParameter showParameter = new ListShowParameter();
+ showParameter.FormId = "PRD_MO";
+ showParameter.PageId = pageId;
+ showParameter.UseOrgId = this.Context.CurrentOrganizationInfo.ID;
+ showParameter.IsLookUp = true;
+ this.View.ShowForm(showParameter);
+ this.View.ShowForm(showParameter, delegate (FormResult result)
{
- ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
- if (listSelectedRowCollection != null)
+ object returnData = result.ReturnData;
+ if (returnData is ListSelectedRowCollection)
{
- foreach (var listSelectedRow in listSelectedRowCollection)
+ ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
+ LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
+ if (listSelectedRowCollection != null)
{
- if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
- return;
- //浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
- string sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
- int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
- this.Model.CreateNewEntryRow("FEntity");
- this.View.Model.SetItemValueByNumber("FORGID", "100", Fseq);
- this.View.Model.SetValue("FSCOrderNo", listSelectedRow.DataRow["FBillNo"].ToString(), Fseq);
- this.View.Model.SetValue("FSRCBILLENTRYSEQ", listSelectedRow.DataRow["t1_FSeq"].ToString(), Fseq);
- this.View.Model.SetValue("FMatrailId", listSelectedRow.DataRow["FMaterialId_Id"].ToString(), Fseq);//2129900005
- this.View.Model.SetValue("FFUnit", listSelectedRow.DataRow["FUnitId_Id"].ToString(), Fseq);
- this.View.Model.SetValue("FOrderQuantity", listSelectedRow.DataRow["FQty"].ToString(), Fseq);
- this.View.Model.SetValue("FProductWorkShopId", listSelectedRow.DataRow["FWorkShopID_Id"].ToString(), Fseq);
- this.View.Model.SetValue("FOrderLevel", "3", Fseq);
- this.View.Model.SetValue("FBzDate", DateTime.Now.AddDays(day).ToShortDateString(), Fseq);//棰勮寮�宸ユ棩鏈�
- this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
- Fseq++;
+ foreach (var listSelectedRow in listSelectedRowCollection)
+ {
+ if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
+ {
+ LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:"+listSelectedRow.DataRow["FBillNo"].ToString()+ ", 琛屽彿," +listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��");
+ continue;
+ }
+ //浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
+ string sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+ int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ if (day < 0)
+ {
+ LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:鏃ユ湡澶潬鍚庯紝" + listSelectedRow.DataRow["FBillNo"].ToString()+ ", 琛屽彿, "+listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= "+ day.ToString());
+ //LogHelper.Info(sql);
+ continue;
+ }
+ this.Model.CreateNewEntryRow("FEntity");
+ this.View.Model.SetItemValueByNumber("FORGID", "100", Fseq);
+ this.View.Model.SetValue("FSCOrderNo", listSelectedRow.DataRow["FBillNo"].ToString(), Fseq);
+ this.View.Model.SetValue("FSRCBILLENTRYSEQ", listSelectedRow.DataRow["t1_FSeq"].ToString(), Fseq);
+ this.View.Model.SetValue("FMatrailId", listSelectedRow.DataRow["FMaterialId_Id"].ToString(), Fseq);//2129900005
+ this.View.Model.SetValue("FFUnit", listSelectedRow.DataRow["FUnitId_Id"].ToString(), Fseq);
+ this.View.Model.SetValue("FOrderQuantity", listSelectedRow.DataRow["FQty"].ToString(), Fseq);
+ this.View.Model.SetValue("FProductWorkShopId", listSelectedRow.DataRow["FWorkShopID_Id"].ToString(), Fseq);
+ this.View.Model.SetValue("FOrderLevel", "3", Fseq);
+ this.View.Model.SetValue("FBzDate", DateTime.Now.AddDays(day).ToShortDateString(), Fseq);//棰勮寮�宸ユ棩鏈�
+ this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
+ Fseq++;
+ }
}
}
- }
- });
+ });
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error("閫夊崟澶辫触锛�" + ex.Message);
+ }
}
}
}
--
Gitblit v1.9.1