From 74f3a827b455592df58dccf2ab67e76f722df7c1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 09 八月 2022 16:06:56 +0800
Subject: [PATCH] 报工平台维护
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 30 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 4c7a3d1..d2a73ad 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -58,11 +58,11 @@
{
//
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Sc_ProcessExchangeBillMain set " +
+ string sql = string.Format(@"UpDate Sc_ProcessExchangeBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
@@ -71,7 +71,7 @@
",HWWOrderInterID=" + omodel.HWWOrderInterID.ToString() +
",HWWOrderEntryID=" + omodel.HWWOrderEntryID.ToString() +
",HWWOrderBillNo='" + omodel.HWWOrderBillNo + "'" +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HMaterID2=" + omodel.HMaterID2.ToString() +
@@ -112,9 +112,17 @@
",HMaterIDB='" + omodel.HMaterIDB + "'" +
",HMaterIDC='" + omodel.HMaterIDC + "'" +
",HMaterIDD='" + omodel.HMaterIDD + "'" +
+ ",HPicNumVer='" + omodel.HPicNumVer + "'" +
+ ",HPicNumAssemble='" + omodel.HPicNumAssemble + "'" +
+ ",HMaterTexture='" + omodel.HMaterTexture + "'" +
+ ",HProductNum='" + omodel.HProductNum + "'" +
+ ",HVerNum='" + omodel.HVerNum + "'" +
+ ",HWorkBillSortNo='" + omodel.HWorkBillSortNo + "'" +
//鍔犲叆鐢熶骇绫诲瀷
- ",HWorkTypeNum='" + omodel.HWorkTypeNum +
- "' where HInterID=" + lngBillKey.ToString());
+ ",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鏇存柊涓昏〃
+ oCn.RunProc(sql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -123,33 +131,46 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HRelationQty_In,HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
- "HProcNo,HProcID,HProcNumber,HWorkRemark,HCenterID,HDeptID" +
- ",HDeptNumber,HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
- ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate,HRelBeginDate" +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
+ "HRelationQty,HRelationMoney,HRelationQty_In," +
+ "HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
+ "HProcNo,HProcID,HProcNumber,HWorkRemark," +
+ "HCenterID,HDeptID" +
+ ",HDeptNumber,HGroupID," +
+ "HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate," +
+ "HPlanEndDate,HRelBeginDate" +
",HRelEndDate,HReadyTime,HQueueTime,HMoveTime,HBeginDayQty,HBeginFixQty" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
- ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes," +
+ "HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
+ ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
+ "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + "," + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
") ");
+ oCn.RunProc(sql1);
}
//
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
@@ -248,6 +269,7 @@
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
+ string sErr = "";
try
{
//寰楀埌mainid
@@ -258,6 +280,7 @@
//omodel.HProjectNum = "";
//omodel.HProjectNum = GetNewCodeByNum(omodel.HInterID, 1, 3).ToString();
//
+
oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_ProcessExchangeBillMain " +
@@ -271,6 +294,7 @@
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HWorkBillSortNo" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -282,37 +306,53 @@
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
- ") ");
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+ "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HWorkBillSortNo +
+ "') ");
+ sErr = sErr + "1;";
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
- "HProcNo,HProcID,HProcNumber,HWorkRemark,HCenterID,HDeptID" +
- ",HDeptNumber,HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
- ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate,HRelBeginDate" +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
+ "HRelationQty,HRelationMoney,HRelationQty_In," +
+ "HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
+ "HProcNo,HProcID,HProcNumber,HWorkRemark," +
+ "HCenterID,HDeptID" +
+ ",HDeptNumber,HGroupID," +
+ "HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate," +
+ "HPlanEndDate,HRelBeginDate" +
",HRelEndDate,HReadyTime,HQueueTime,HMoveTime,HBeginDayQty,HBeginFixQty" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
- ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes," +
+ "HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
+ ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
+ "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
- "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','"+ oSub.HPicNum + "'" +
+ "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'" +
") ");
+ sErr = sErr + sql1 + "2;";
+ oCn.RunProc(sql1);
+ sErr = sErr + "2;";
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
{
@@ -323,10 +363,13 @@
}
}
+ sErr = sErr + "3;";
}
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
+ sErr = sErr + "4;";
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + omodel.HInterID.ToString()); //璁剧疆 鏈亾 棣栭亾 杞� 绛変俊鎭�
+ sErr = sErr + "5;";
DataSet ds = new DataSet();
//璁剧疆鏉＄爜鍙� 鍥炲～ 棰嗘枡鎵规
ds = oCn.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + omodel.HInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
@@ -337,10 +380,11 @@
return false;
}
+ sErr = sErr + "6;";
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetDate " + omodel.HInterID.ToString()); //鍥炲～ 寮�宸ュ畬宸ユ棩鏈�
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_RelationQty " + omodel.HInterID.ToString() + ",1"); //杩斿伐娴佽浆鍗� 鍙嶅啓 鎷嗗垎鏁伴噺 鍥炲～浠诲姟鍗� 娴佽浆鍗℃暟閲� 鍥炲～浠诲姟鍗曚笂闄愭暟閲�
-
+
//鎺у埗鍏宠仈鏁伴噺
ds = null;
ds = oCn.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + omodel.HInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
@@ -351,6 +395,7 @@
return false;
}
+ sErr = sErr + "7;";
//
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
@@ -359,7 +404,7 @@
}
catch (Exception e)
{
- sReturn = e.Message;
+ sReturn = sErr + "," + e.Message;
oCn.RollBack();
throw (e);
}
@@ -371,7 +416,7 @@
{
//鏌ヨ涓昏〃
DataSet Ds;
- Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcessExchangeBillMain");
+ Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " ", "Sc_ProcessExchangeBillMain");
if (Ds.Tables[0].Rows.Count == 0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
@@ -407,6 +452,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -606,6 +652,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -662,6 +709,7 @@
omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -812,6 +860,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
--
Gitblit v1.9.1