From d3835d49a3c673a37c78a79600320e287d4d320b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 06 三月 2021 10:54:38 +0800
Subject: [PATCH] 日计划导入增加删除用料清单审核状态验证 齐套信息明细 颜色渲染更改
---
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 92 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 3ec2bc4..bb3f2a8 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -17,6 +17,7 @@
using System.Linq;
using ZD.Share.Common;
using ZD.Cloud.WebApi;
+using Demo.Utility;
namespace Demo.BillView.PRD
{
@@ -80,8 +81,13 @@
{
if (!string.IsNullOrEmpty(fileFullPath))
{
- DataSet ds = helper.ReadFromFile(fileFullPath, 1);
+ NpoiHelper np = new NpoiHelper();
+ DataSet ds = np.ReadExcel(fileFullPath, 1);
DataTable dt = ds.Tables[0];
+ RemoveEmpty(dt);//鍘婚櫎绌鸿
+ dt.Rows.RemoveAt(0);//鍘婚櫎鏍囬琛�
+ //DataSet ds = helper.ReadFromFile(fileFullPath, 1);
+ //DataTable dt = ds.Tables[0];
LogHelper.Info("瀵煎叆鍔熻兘锛歞t琛屾暟锛�" + dt.Rows.Count);
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
if (dt.Rows.Count > 0)
@@ -117,20 +123,26 @@
for (int i = 0; i < dt.Rows.Count; i++)
{
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏(2.28+鐢熶骇璁㈠崟鏄庣粏琛屽彿楠岃瘉)
- string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
+ string sql = string.Format(@"/*dialect*/
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.* FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID
+join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
WHERE T1.FBILLNO = '{0}' AND T3.FNUMBER = '{1}' and FSEQ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][2].ToString());
DataTable _dt = new DataTable();
_dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
string FLOT = "";//FLOT 鎵规
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
+ string FMoFBillType = "";
if (_dt.Rows.Count > 0)
{
FLOT = _dt.Rows[0]["FLOT"].ToString();
FQTY = _dt.Rows[0]["FQTY"].ToString();
FBILLNO = _dt.Rows[0]["FBILLNO"].ToString();
+ FMoFBillType = _dt.Rows[0]["FMoFBillType"].ToString();
}
//鐗╂枡缂栫爜 + 鐢熶骇璁㈠崟鍙� + 鐢熶骇璧勬簮 + 鐢熶骇璁㈠崟琛屽彿 鍘诲垽鏂槸鍚﹀鍏ヨ繃 甯﹀嚭鏃ヨ鍒掑伐鍗旾D鍙婄紪鍙�
string fDayPlanID = "";
@@ -147,6 +159,7 @@
//DynamicObject row = new DynamicObject(entity.DynamicObjectType);
this.Model.CreateNewEntryRow("FEntity");
this.Model.SetValue("FSEQ", i + 1, i);
+ this.Model.SetValue("FMoFBillType", FMoFBillType, i);
this.Model.SetValue("FSalOrderNo", dt.Rows[i][0].ToString(), i);
this.Model.SetValue("FSCOrderNo", dt.Rows[i][1].ToString(), i);
this.Model.SetItemValueByNumber("FORGID", "100", i);
@@ -157,7 +170,7 @@
this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);
this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);
this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);
- this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].ToString()), i);
+ this.Model.SetValue("FDeliveryDate", dt.Rows[i][13].ToString(), i);
this.Model.SetValue("FOrderLevel", OrderType(dt.Rows[i][14].ToString()), i);
this.Model.SetValue("FOrderQuantity", FQTY, i);
this.Model.SetValue("FDayPlanID", fDayPlanID, i);//鏃ヨ鍒掑伐鍗旾D
@@ -264,6 +277,23 @@
this.View.ShowErrMessage(_result);
return;
}
+ //鏍￠獙鐢熶骇鐢ㄦ枡娓呭崟鏄惁瀹℃牳
+ foreach (DynamicObject current in entityDataObjoct)
+ {
+ //鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
+ sql = string.Format(@"/*dialect*/SELECT FBILLNO FROM T_PRD_PPBOM T1
+WHERE T1.FMOBILLNO = '{0}' AND T1.FMATERIALID = '{1}' AND T1.FMOENTRYSEQ = '{2}' and FDOCUMENTSTATUS <>'C'
+", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ DataTable dt = new DataTable();
+ dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
+ if (dt.Rows.Count > 0)
+ _result += "搴忓彿锛�" + Convert.ToString(current["SEQ"]) + ",鐢熶骇璁㈠崟鍙凤細" + Convert.ToString(current["FSCOrderNo"]) + ",鐢熶骇璁㈠崟鏄庣粏琛屽彿锛�" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "鐗╂枡" + (current["FMatrailId"] as DynamicObject)["Number"] + "瀵瑰簲鐨勭敓浜х敤鏂欐竻鍗曪細" + dt.Rows[0][0] + "鏈鏍�";
+ }
+ if (_result != "")
+ {
+ this.View.ShowErrMessage(_result);
+ return;
+ }
foreach (DynamicObject current in entityDataObjoct)
{
if (Convert.ToInt32(current["FNoScheduled"]) < 0)
@@ -281,9 +311,12 @@
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏 +鐢熶骇璁㈠崟鏄庣粏琛屽彿
sql = string.Format(@"
/*dialect*/
-SELECT T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1
+SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1
LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID
+ join ( select A.FBILLTYPEID,B.FNAME from T_BAS_BILLTYPE A
+JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID
+where FBILLFORMID='PRD_MO' AND FNAME<>'鐢熺敘瑷傚柈')t4 on t1.FBILLTYPE =t4.FBILLTYPEID
WHERE T1.FBILLNO = '{0}' AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
DataTable dt = new DataTable();
dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -295,6 +328,9 @@
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
string FHUnitID = "";//鍗曚綅
+ string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+ string FPlanEndDate = "";//缁撴潫鏃ユ湡
+ string FMoFBillType = "";//
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -303,6 +339,9 @@
FQTY = dt.Rows[0]["FQTY"].ToString();
FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+ FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+ FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
+ FMoFBillType = dt.Rows[0]["FMoFBillType"].ToString();
}
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -313,6 +352,7 @@
jsonRoot.Add("IsVerifyBaseDataField", "");
JObject jsonModel = new JObject();
jsonModel.Add("FPreparatDate", date.ToString());//缂栧埗鏃ユ湡
+ jsonModel.Add("FMoFBillType", FMoFBillType);//
jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//鐢熶骇璁㈠崟鏄庣粏琛屽彿
jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //鐢熶骇璁㈠崟鍙稦SCOrderNo
jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//閿�鍞鍗曞彿
@@ -321,12 +361,17 @@
jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
+ jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
+
//jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
@@ -374,7 +419,7 @@
Entry.Add(jsonFPOOrderEntry);
}
jsonModel.Add("FEntity", Entry);
- jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//婧愬崟缂栧彿
+ jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"]));
jsonRoot.Add("Model", jsonModel);
var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
JObject saveObj = JObject.Parse(result);
@@ -512,6 +557,8 @@
string FQTY = "";//FQTY 鐢熶骇璁㈠崟鏁伴噺
string FBILLNO = "";//FBILLNO 鍘熷崟鍙�
string FHUnitID = "";//鍗曚綅
+ string FPlanBeginDate = "";//寮�濮嬫棩鏈�
+ string FPlanEndDate = "";//缁撴潫鏃ユ湡
if (dt.Rows.Count > 0)
{
FID = dt.Rows[0]["FID"].ToString();
@@ -520,6 +567,8 @@
FQTY = dt.Rows[0]["FQTY"].ToString();
FBILLNO = dt.Rows[0]["FBILLNO"].ToString();
FHUnitID = dt.Rows[0]["FUnitNumber"].ToString();
+ FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();
+ FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();
}
JObject jsonRoot = new JObject();
jsonRoot.Add("Creator", "");
@@ -537,13 +586,16 @@
jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//閿�鍞鍗曟暟閲�
jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//浜よ揣鏈烪OrderCommitDate
jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//鍗曚綅
-
+ jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//璁″垝寮�濮嬫棩鏈�
+ jsonModel.Add("FHPlanEndDate", FPlanEndDate);//璁″垝瀹屽伐鏃ユ湡
//jsonModel.Add("FBatch", current["FBatch"].ToString());//鎵规
jsonModel.Add("FBatch", FLOT);//鎵规
jsonModel.Add("FHOrderNeedQty", FQTY);// 璁㈠崟闇�姹傛暟閲�
jsonModel.Add("FPrdBillNo", FBILLNO); ;//婧愬崟缂栧彿
jsonModel.Add("FPRDMOMAINID", FID); ;//婧愬崟涓诲唴鐮�
jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//婧愬崟瀛愬唴鐮�
+ jsonModel.Add("FMoFID", FID); ;//婧愬崟涓诲唴鐮�
+ jsonModel.Add("FMoFentryId", FENTRYID); ;//婧愬崟瀛愬唴鐮�
jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//鐢熶骇璁㈠崟鏁伴噺
jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//鏃ヨ鍒掓暟閲�
jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//鏈帓鏁伴噺
@@ -598,5 +650,33 @@
LogHelper.Error("鐢熶骇鏃ヨ鍒掑鍏ヨ褰曟棩蹇楄烦鍑�:" + ex.Message.ToString());
}
}
+
+ /// <summary>
+ /// dt鍘荤┖琛�
+ /// </summary>
+ /// <param name="dt"></param>
+ public void RemoveEmpty(DataTable dt)
+ {
+ List<DataRow> removelist = new List<DataRow>();
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ bool IsNull = true;
+ for (int j = 0; j < dt.Columns.Count; j++)
+ {
+ if (!string.IsNullOrEmpty(dt.Rows[i][j].ToString().Trim()))
+ {
+ IsNull = false;
+ }
+ }
+ if (IsNull)
+ {
+ removelist.Add(dt.Rows[i]);
+ }
+ }
+ for (int i = 0; i < removelist.Count; i++)
+ {
+ dt.Rows.Remove(removelist[i]);
+ }
+ }
}
}
--
Gitblit v1.9.1