From 3bdc41a3c5a0857b04c1ee4d6f7cc515d1983820 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 04 二月 2021 10:26:05 +0800
Subject: [PATCH] 齐套分析增加物料属性字段
---
src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs | 10 ++++-
src/Model/Demo.Model/Model/PRD_PPBOM.cs | 4 ++
src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs | 30 +++++++++++++-
src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs | 4 +
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 41 +++++++++++++-------
5 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
index 3923f23..99839da 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisDetails.cs
@@ -35,7 +35,7 @@
FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterID").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
FHMainICMOEntryID = this.View.OpenParameter.GetCustomParameter("FHMainICMOEntryID").ToString();// 涓荤敓浜ц鍗曞瓙鍐呯爜
FHICMOInterID = this.View.OpenParameter.GetCustomParameter("FHICMOInterID").ToString();//鏃ヨ鍒掕鍗曚富鍐呯爜
- string sql = string.Format(@"/*dialect*/select * from JIT_MOMaterReadysBill where FHMainICMOInterIDr ='{0}' and FHMainICMOEntryID ='{1}' and FHICMOInterID='{2}' order by FPlanDate, FHStockQty desc ,FHMaterID ", FHMainICMOInterIDr, FHMainICMOEntryID, FHICMOInterID);
+ string sql = string.Format(@"/*dialect*/select * from view_JIT_MOMaterReadysBill where FHMainICMOInterIDr ='{0}' and FHMainICMOEntryID ='{1}' and FHICMOInterID='{2}' order by FPlanDate, FHStockQty desc ,FHMaterID ", FHMainICMOInterIDr, FHMainICMOEntryID, FHICMOInterID);
DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
if (dt.Rows.Count > 0)
{
@@ -51,6 +51,7 @@
this.Model.SetValue("FMateralCount", dt.Rows[i]["FHStockQty"].ToString(), i);//鐗╂枡鏁伴噺
this.Model.SetValue("FOccupyCount", dt.Rows[i]["FOccupyCount"].ToString(), i);//鍗犵敤鏁伴噺
this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
+ this.Model.SetValue("FIsHavePur", dt.Rows[i]["FIsHavePur"].ToString(), i);//鏄惁鏈夐噰璐鍗�
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
@@ -116,7 +117,7 @@
public void SearchList()
{
string sqlwhere = $" where FHMainICMOInterIDr ='{FHMainICMOInterIDr}' and FHMainICMOEntryID ='{FHMainICMOEntryID}' and FHICMOInterID='{FHICMOInterID}'";
- string sql = string.Format(@"/*dialect*/select * from JIT_MOMaterReadysBill ");
+ string sql = string.Format(@"/*dialect*/select * from view_JIT_MOMaterReadysBill ");
//鐗╂枡
if ((this.Model.GetValue("FMateralId") as DynamicObject) != null)
{
@@ -128,6 +129,10 @@
string FCompleteStatus = Convert.ToString(this.Model.GetValue("FCompleteStatus"));
if (!string.IsNullOrEmpty(FCompleteStatus))
sqlwhere += $" and FComPlete='{FCompleteStatus}'";
+ //鏈夋棤閲囪喘璁㈠崟
+ string FIsHavePurs = Convert.ToString(this.Model.GetValue("FIsHavePurs"));
+ if (!string.IsNullOrEmpty(FIsHavePurs))
+ sqlwhere += $" and FIsHavePur='{FIsHavePurs}'";
//鏃ヨ鍒掓棩鏈�
string FPlanDate = Convert.ToString(this.Model.GetValue("FPlanDate2"));
@@ -163,6 +168,7 @@
this.Model.SetValue("FMateralCount", dt.Rows[i]["FHStockQty"].ToString(), i);//鐗╂枡鏁伴噺
this.Model.SetValue("FOccupyCount", dt.Rows[i]["FOccupyCount"].ToString(), i);//鍗犵敤鏁伴噺
this.Model.SetValue("FCompleteDetailStatus", dt.Rows[i]["FComPlete"].ToString(), i);//鏄惁榻愬
+ this.Model.SetValue("FIsHavePur", dt.Rows[i]["FIsHavePur"].ToString(), i);//鏄惁鏈夐噰璐鍗�
this.Model.SetValue("FHMainICMOInterIDr", dt.Rows[i]["FHMainICMOInterIDr"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPRDBillNo", dt.Rows[i]["FPRDBillNo"].ToString(), i);//鐢熶骇璁㈠崟鍐呯爜
this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�
diff --git a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
index 6aacb61..2d85f5a 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs
@@ -111,10 +111,34 @@
DateTime date = Convert.ToDateTime(this.Model.GetValue("F_Paez_Date"));
if (dt.Rows.Count > 0)
{
- //Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
- //DynamicObjectCollection rows = this.Model.GetEntityDataObject(entity);
- this.Model.DeleteEntryData("FEntity");
+ //楠岃瘉瀵煎叆妯℃澘
+ string ErrorResult = "";
+ string error = "";
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ error = "";
+ if (dt.Rows[i][1].ToString() == "")
+ error += "鐢熶骇璁㈠崟鍙蜂笉鑳戒负绌�;";
+ if (dt.Rows[i][2].ToString() == "")
+ error += "鐢熶骇缁勭粐涓嶈兘涓虹┖;";
+ if (dt.Rows[i][3].ToString() == "")
+ error += "鐢熶骇杞﹂棿涓嶈兘涓虹┖;";
+ if (dt.Rows[i][5].ToString() == "")
+ error += "浜у搧浠ｇ爜涓嶈兘涓虹┖;";
+ if (dt.Rows[i][13].ToString() == "")
+ error += "浜よ揣鏃ユ湡涓嶈兘涓虹┖;";
+ if (dt.Rows[i][14].ToString() == "")
+ error += "璁㈠崟绛夌骇涓嶈兘涓虹┖;";
+ if (error.Length > 0)
+ ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n";
+ }
+ if (ErrorResult.Length > 0)
+ {
+ this.View.ShowErrMessage(ErrorResult);
+ return;
+ }
+ this.Model.DeleteEntryData("FEntity");
for (int i = 0; i < dt.Rows.Count; i++)
{
//鏍规嵁鐢熶骇璁㈠崟鍙峰拰鐗╂枡鏌ヨ鏄惁瀛樺湪鏄庣粏
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 529135e..d5dc6b4 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -396,7 +396,7 @@
{
// 闇�瑕佹崟鑾烽敊璇紝浠ョ‘淇濆鐞嗙粨鏉熸椂锛屽叧闂繘搴︽粴鍔ㄧ晫闈�
// 寮曞叆鍔熻兘瀹為檯澶勭悊鍑芥暟
- this.CompleteSetAnalysisBySQL();
+ this.CompleteSetAnalysisBatch();
}
finally
{
@@ -470,18 +470,20 @@
ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
//闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
string sql = @"
-/*dialect*/
+ /*dialect*/
select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
-T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount from SC_WORKBILLSORTBILLMAIN a
+T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID from SC_WORKBILLSORTBILLMAIN a
join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
LEFT JOIN(select FID, MAX(FENTRYID) FENTRYID, SUM(FNeedQty) FNeedQty, FMATERIALID from T_PRD_PPBOMENTRY
group by FMATERIALID, FID ) T2 on T1.FID = t2.FID
--LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
+JOIN t_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
ORDER BY b.FHMASTERDATE,a.FHOrderLev
";
ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -545,12 +547,13 @@
FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FErpClsID = _item.FErpClsID,
/* 2021 1.26 鏇存敼涓簄eed
FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
*/
FComPlete = sjkcList.FBASEQTY >= need ? "榻愬" : "鏈綈濂�",
FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
- });
+ }); ;
//鎵ｅ噺鎬诲簱瀛樻暟閲�
sjkcList.FBASEQTY = sjkcList.FBASEQTY >= fCompleteCount ? sjkcList.FBASEQTY - fCompleteCount : 0;
//鍓╀綑鏃ヨ鍒掗渶姹傛暟閲�
@@ -584,7 +587,9 @@
FHLeftQty = 0,//鍙敤鏁伴噺
FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
FComPlete = "鏈綈濂�",
- FPlanDate = item.FHMASTERDATE // 鏃ヨ鍒掓棩鏈�
+ FPlanDate = item.FHMASTERDATE, // 鏃ヨ鍒掓棩鏈�
+ FErpClsID = _item.FErpClsID
+
});
}
}
@@ -627,6 +632,7 @@
jsonModel.Add("FLackCount", item.FLackCount);
jsonModel.Add("FOccupyCount", item.FOccupyCount);
jsonModel.Add("FPlanDate", item.FPlanDate);
+ jsonModel.Add("FErpClsID", item.FErpClsID);
if (item.FOwnerId != null)
jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
jsonRoot.Add("Model", jsonModel);
@@ -710,18 +716,20 @@
ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
//闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
string sql = @"
-/*dialect*/
+ /*dialect*/
select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
-T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount from SC_WORKBILLSORTBILLMAIN a
+T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID from SC_WORKBILLSORTBILLMAIN a
join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
LEFT JOIN(select FID, MAX(FENTRYID) FENTRYID, SUM(FNeedQty) FNeedQty, FMATERIALID from T_PRD_PPBOMENTRY
group by FMATERIALID, FID ) T2 on T1.FID = t2.FID
--LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
+JOIN t_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
+and b.FHQTY>0
ORDER BY b.FHMASTERDATE,a.FHOrderLev
";
ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -735,7 +743,6 @@
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
foreach (var item in DatePlanList)
{
- this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count));
//绛涢�夊嚭褰撴棩璁″垝鏁版嵁
var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
foreach (var _item in _BomList)
@@ -785,6 +792,7 @@
FHStockQty = sjkcList.FBASEQTY,//鍗虫椂搴撳瓨
FHLeftQty = Inventory.FBASEQTY,//鍙敤鏁伴噺
FOccupyCount = occupyMaterial,//鍗犵敤鏁伴噺
+ FErpClsID = _item.FErpClsID,
/* 2021 1.26 鏇存敼涓簄eed
FComPlete = sjkcList.FBASEQTY >= _item.PlanCount ? "榻愬" : "鏈綈濂�",
*/
@@ -817,6 +825,7 @@
FOwnerTypeId = "BD_OwnerOrg",
FUnitDosage = _item.dwyl.ToString(),//鍗曚綅鐢ㄩ噺
FSumPlanCount = _item.PlanCount.ToString(),//璁″垝鎬绘暟閲�
+ FErpClsID = _item.FErpClsID,
FCompleteCount = 0, //榻愬鏁伴噺
FCompleteCount1 = 0, //榻愬鏁伴噺
FLackCount = _item.PlanCount,//缂烘枡鏁伴噺
@@ -861,6 +870,7 @@
FBatchModel.Add("FLackCount", item.FLackCount);
FBatchModel.Add("FOccupyCount", item.FOccupyCount);
FBatchModel.Add("FPlanDate", item.FPlanDate);
+ FBatchModel.Add("FErpClsID", item.FErpClsID);
if (item.FOwnerId != null)
FBatchModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });
Fentity.Add(FBatchModel);
@@ -961,15 +971,16 @@
ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();
//闇�瑕侀綈濂楀垎鏋愮殑鏁版嵁
sql = @"
-/*dialect*/
+ /*dialect*/
select a.FPRDMOMAINID,a.FPRDMOENTYID,a.FID,b.FEntryID,a.FHPRDORGID FStockOrgId,t5.FNUMBER as OrgFnumber,a.FHOrderLev,b.FHQTY,b.FHMASTERDATE,T1.FBillNo,T1.FMOBillNO,T1.FMOEntrySeq,T1.FMoId,T1.FMaterialID,T1.FQty,
-T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount from SC_WORKBILLSORTBILLMAIN a
+T2.FMATERIALID FMATERIALID2, T4.FNumber,T2.FNeedQty,FNeedQty/FQty dwyl,(FHQTY-ISNULL(FProductNum,0))*(FNeedQty/FQty) PlanCount,TBase.FErpClsID from SC_WORKBILLSORTBILLMAIN a
join SC_WORKBILLSORTBILLSub b on a.FID = b.FID
join T_PRD_PPBOM T1 on a.FPRDMOMAINID = t1.FMoId and a.FPRDMOENTYID = t1.FMOENTRYID
LEFT JOIN(select FID, MAX(FENTRYID) FENTRYID, SUM(FNeedQty) FNeedQty, FMATERIALID from T_PRD_PPBOMENTRY
group by FMATERIALID, FID ) T2 on T1.FID = t2.FID
--LEFT JOIN T_STK_Inventory T3 on t2.FMATERIALID = t3.FMATERIALID
JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
+JOIN t_BD_MaterialBase TBase on T2.FMATERIALID = TBase.FMATERIALID
JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
--鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
@@ -987,7 +998,7 @@
Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
foreach (var item in DatePlanList)
{
- this.View.Session["ProcessRateValue"] = Convert.ToInt32(this.View.Session["ProcessRateValue"]) + Convert.ToInt32((decimal)(1.0 / DatePlanList.Count));
+
//绛涢�夊嚭褰撴棩璁″垝鏁版嵁
var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
foreach (var _item in _BomList)
@@ -1026,6 +1037,7 @@
FHMaterID = _item.FMATERIALID2,
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
+ FErpClsID = _item.FErpClsID,
FPRDBillNo = _item.FMOBillNO,
FOwnerTypeId = "BD_OwnerOrg",
FOwnerId = Inventory.FOwnerId,
@@ -1064,6 +1076,7 @@
FHICMOInterID = _item.FID.ToString(),
FHICMOEntryID = _item.FEntryID.ToString(),
FHMaterID = _item.FMATERIALID2,
+ FErpClsID = _item.FErpClsID,
FHStockOrgID = _item.FStockOrgId,
FHPRDORGID = _item.FStockOrgId,
FPRDBillNo = _item.FMOBillNO,
@@ -1096,10 +1109,10 @@
insert into z_JIT_MOMaterReadysBill (column1)
values('')
insert into JIT_MOMaterReadysBill
-(FID, FBILLNO, FDOCUMENTSTATUS, FHMAINICMOINTERIDR, FHMAINICMOENTRYID, FHICMOINTERID, FHICMOENTRYID, FHMATERID, FHSTOCKORGID, FHSTOCKQTY, FHLEFTQTY, FHPRDORGID, FUNITDOSAGE, FSUMPLANCOUNT, FPRDBILLNO, FOWNERID, FOWNERTYPEID, FIDENTIFICAT, FPLANDATE, FCOMPLETE, FLACKCOUNT, FOCCUPYCOUNT, FCOMPLETECOUNT1)
-select id, '', 'A', '{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', 'BD_OwnerOrg', '','{13}','{14}','{15}','{16}','{17}' from z_JIT_MOMaterReadysBill
+(FID, FBILLNO, FDOCUMENTSTATUS, FHMAINICMOINTERIDR, FHMAINICMOENTRYID, FHICMOINTERID, FHICMOENTRYID, FHMATERID, FHSTOCKORGID, FHSTOCKQTY, FHLEFTQTY, FHPRDORGID, FUNITDOSAGE, FSUMPLANCOUNT, FPRDBILLNO, FOWNERID, FOWNERTYPEID, FIDENTIFICAT, FPLANDATE, FCOMPLETE, FLACKCOUNT, FOCCUPYCOUNT, FCOMPLETECOUNT1,FErpClsID)
+select id, '', 'A', '{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}', '{8}', '{9}', '{10}', '{11}', '{12}', 'BD_OwnerOrg', '','{13}','{14}','{15}','{16}','{17}',{18} from z_JIT_MOMaterReadysBill
delete z_JIT_MOMaterReadysBill
-", item.FHMainICMOInterIDr, item.FHMainICMOEntryID, item.FHICMOInterID, item.FHICMOEntryID, item.FHMaterID, item.FHStockOrgID, item.FHStockQty, item.FHLeftQty, item.FHPRDORGID, item.FUnitDosage, item.FSumPlanCount, item.FPRDBillNo, item.FOwnerId == null ? "0" : item.FOwnerId, item.FPlanDate.ToString("yyyy-MM-dd"), item.FComPlete, item.FLackCount, item.FOccupyCount, item.FCompleteCount1);
+", item.FHMainICMOInterIDr, item.FHMainICMOEntryID, item.FHICMOInterID, item.FHICMOEntryID, item.FHMaterID, item.FHStockOrgID, item.FHStockQty, item.FHLeftQty, item.FHPRDORGID, item.FUnitDosage, item.FSumPlanCount, item.FPRDBillNo, item.FOwnerId == null ? "0" : item.FOwnerId, item.FPlanDate.ToString("yyyy-MM-dd"), item.FComPlete, item.FLackCount, item.FOccupyCount, item.FCompleteCount1, item.FErpClsID);
sqlList.Add(sql);
this.View.Session["ProcessRateValue"] = Convert.ToInt32((Convert.ToDecimal(98) / completeAnalysisTempModel.Count) * jdtmmm);
jdtmmm++;
diff --git a/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
index 6ce0f34..13ff2d5 100644
--- a/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
+++ b/src/Model/Demo.Model/Model/CompleteAnalysisTempModel.cs
@@ -128,6 +128,8 @@
/// 鏃ヨ鍒掓棩鏈�
/// </summary>
public DateTime FPlanDate { get; set; }
-
+ public int FErpClsID { get; set; }
+
+
}
}
diff --git a/src/Model/Demo.Model/Model/PRD_PPBOM.cs b/src/Model/Demo.Model/Model/PRD_PPBOM.cs
index 665a63a..f0676de 100644
--- a/src/Model/Demo.Model/Model/PRD_PPBOM.cs
+++ b/src/Model/Demo.Model/Model/PRD_PPBOM.cs
@@ -99,6 +99,10 @@
/// 棰勮娑堣�楃敤閲�
/// </summary>
public decimal PlanCount { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ /// </summary>
+ public int FErpClsID { get; set; }
}
--
Gitblit v1.9.1