From d5ddf535c11458df512e62b504773401656ae74c Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期日, 28 二月 2021 14:17:47 +0800
Subject: [PATCH] 选单按钮
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index d7bc10c..32dede0 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -245,7 +245,7 @@
else
{
var type = this.View.Model.GetValue("FQTTYPE");
- if(type =="鏍囧噯Bom")
+ if (type == "鏍囧噯Bom")
formPa.CustomParams.Add("tempName", "JIT_MOMaterReadysBomBill");
//榻愬鍒嗘瀽鏄庣粏鍒楄〃璺宠浆
formPa.FormId = "paez_CompleteAnalysisDetail";
@@ -452,6 +452,10 @@
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"]));
+ if (Convert.ToString(current["FResourcesId_Id"]) != "0")
+ {
+ jsonModel.Add("FHSourceID", new JObject() { ["Fnumber"] = (current["FResourcesId"] as DynamicObject)?["Number"].ToString() });//鐢熶骇璧勬簮
+ }
jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"]));
jsonModel.Add("FDayPlanQuantity", Convert.ToDecimal(current["FDayPlanQuantity"]) + Convert.ToDecimal(current["FQTYLS"]));
jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"]));
@@ -535,7 +539,7 @@
jsonRoot.Add("SubSystemId", "");
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
- jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
+ jsonModel.Add("FPreparatDate", Convert.ToString(current["FBzDate"]));//缂栧埗鏃ユ湡锛堟敼涓洪璁″紑宸ユ棩鏈燂級
jsonModel.Add("FMoFBillType", FMoFBillType);//
jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
@@ -547,7 +551,7 @@
jsonModel.Add("FBOMID", new JObject() { ["Fnumber"] = FBomNumber });//BOM鐗堟湰
jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
- //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
+ //jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
@@ -2193,7 +2197,7 @@
/// </summary>
public void SearchList()
{
- string sqlwhere = " where 1=1";
+ string sqlwhere = " and 1=1";
if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
{
string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
@@ -2216,9 +2220,14 @@
sqlwhere += $" and t3.FNumber='{FMatralId}'";
}
//缂栧埗鏃ユ湡
- string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
- if (!string.IsNullOrEmpty(FPreparatDate))
- sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
+ string FBeginPreparatDate = Convert.ToString((this.Model.GetValue("FBrginPreparatDate")));
+ if (!string.IsNullOrEmpty(FBeginPreparatDate))
+ sqlwhere += $" and FPreparatDate>='{FBeginPreparatDate}'";
+
+ //缂栧埗鏃ユ湡
+ string FEndPreparatDate = Convert.ToString((this.Model.GetValue("FEndPreparatDate")));
+ if (!string.IsNullOrEmpty(FEndPreparatDate))
+ sqlwhere += $" and FPreparatDate<='{FEndPreparatDate}'";
try
{
string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS
@@ -2247,7 +2256,7 @@
this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//璁㈠崟绛夌骇
this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//鐢熶骇璁㈠崟鍙�
this.Model.SetValue("FSalOrderNo", dt.Rows[i]["FHSEORDERBILLNO"].ToString(), i);//閿�鍞鍗曞彿
- this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//缂栧埗鏃ユ湡
+ this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//棰勮寮�宸ユ棩鏈�
this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID
this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID
@@ -2317,7 +2326,7 @@
/// </summary>
public void SearchListEdit()
{
- string sqlwhere = " where 1=1";
+ string sqlwhere = " and 1=1";
if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
{
@@ -2333,7 +2342,6 @@
string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
if (!string.IsNullOrEmpty(FScOrderMainNo))
sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
-
//鐗╂枡
if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
{
@@ -2341,10 +2349,14 @@
if (!string.IsNullOrEmpty(FMatralId))
sqlwhere += $" and t3.FNumber='{FMatralId}'";
}
- //缂栧埗鏃ユ湡
- string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
- if (!string.IsNullOrEmpty(FPreparatDate))
- sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
+ //缂栧埗鏃ユ湡寮�濮�
+ string FBeginPreparatDate = Convert.ToString((this.Model.GetValue("FBrginPreparatDate")));
+ if (!string.IsNullOrEmpty(FBeginPreparatDate))
+ sqlwhere += $" and FPreparatDate>='{FBeginPreparatDate}'";
+ //缂栧埗鏃ユ湡缁撴潫
+ string FEndPreparatDate = Convert.ToString((this.Model.GetValue("FEndPreparatDate")));
+ if (!string.IsNullOrEmpty(FEndPreparatDate))
+ sqlwhere += $" and FPreparatDate<='{FEndPreparatDate}'";
try
{
string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS
@@ -2373,7 +2385,7 @@
this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//璁㈠崟绛夌骇
this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//鐢熶骇璁㈠崟鍙�
this.Model.SetValue("FSalOrderNo", dt.Rows[i]["FHSEORDERBILLNO"].ToString(), i);//閿�鍞鍗曞彿
- this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//缂栧埗鏃ユ湡
+ this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//棰勮寮�宸ユ棩鏈�
this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//鐢熶骇璁㈠崟鏁伴噺
this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID
this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID
@@ -2564,7 +2576,7 @@
-- select FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
-- )
",
-sqlWhere, day);
+ sqlWhere, day);
LogHelper.Info("鐢熸垚鏃ヨ鍒掔敤鏂欐竻鍗曞噯澶囨暟鎹畇ql:" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
DataTable dt = ds.Tables[0];
@@ -3371,6 +3383,7 @@
}
}
+ //鐢熶骇璁″垝骞冲彴閫夊崟 鐢熶骇璁㈠崟鏁版嵁
public void SelectMenu()
{
//鑾峰彇鍗曟嵁浣撲俊鎭�
@@ -3378,6 +3391,14 @@
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
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();
@@ -3397,6 +3418,8 @@
{
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)
+ 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);
@@ -3409,6 +3432,7 @@
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++;
}
--
Gitblit v1.9.1