From bf3ccf84ff0ed2576052cb0b34659aea363626b5 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 12 十一月 2021 18:03:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
index 659e23f..6b804b6 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
@@ -91,6 +91,13 @@
public const Int16 HSupIDCol = 68;
public const Int16 HPassRateCol = 69;
public const Int16 HSumPassRateCol = 70;
+ public const Int16 HMouldNoCol = 71;
+ public const Int16 HProcWorkNumCol = 72;
+ public const Int16 HOverRateCol = 73;
+ public const Int16 HMaxQtyCol = 74;
+ public const Int16 HTechnologyParameterCol = 75;
+ public const Int16 HPicNumCol = 76;
+ public const Int16 HProcCheckNoteCol = 77;
//
//
//琛�2
@@ -1145,7 +1152,8 @@
grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value = oSub.HSeOrderEntryID.ToString();
grdMain.Rows[i].Cells[HWWOrderBillNoCol].Value = oSub.HWWOrderBillNo;
grdMain.Rows[i].Cells[HWWOrderEntryIDCol].Value = oSub.HWWOrderEntryID.ToString();
- grdMain.Rows[i].Cells[HWWOrderInterIDCol].Value = oSub.HWWOrderInterID.ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oSub.HMouldNo.ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oSub.HProcWorkNum.ToString();
i = i + 1;
}
@@ -1292,6 +1300,36 @@
BillNew.omodel.HMainMaterID = ClsPub.isLong(this.txtHMaterID.Text.ToString());
BillNew.omodel.HKeyMaterID = ClsPub.isLong(this.txtHMaterID.Text.ToString());
BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(this.txtHOrderProcNO.Text.ToString());
+
+ BillNew.omodel.HEquipMentID =0;
+ BillNew.omodel.HMateOutBatchNo = "";
+ BillNew.omodel.HProjectNum = "";
+ //===================
+ BillNew.omodel.HProdMaterCode = "";
+ BillNew.omodel.HSeOrderBillNo = "";
+ BillNew.omodel.HCusShortName = "";
+ BillNew.omodel.HCusNeedMaterial = "";
+ BillNew.omodel.HPlanSendGoodsDate = "";
+ BillNew.omodel.HProdMaterName = "";
+ BillNew.omodel.HCusName = "";
+ BillNew.omodel.HWorkRemark = "";
+ BillNew.omodel.HImportNote = "";
+ BillNew.omodel.HMaterNumber_A = "";
+ BillNew.omodel.HMaterNumber_B = "";
+ BillNew.omodel.HMaterNumber_C = "";
+ BillNew.omodel.HMaterNumber_D = "";
+ BillNew.omodel.HProdType = "";
+ BillNew.omodel.HMaterShortName = "";
+ BillNew.omodel.HMaterIDA = "";
+ BillNew.omodel.HMaterIDB = "";
+ BillNew.omodel.HMaterIDC = "";
+ BillNew.omodel.HMaterIDD = "";
+ //===================
+ BillNew.omodel.HPicNumVer = "";
+ BillNew.omodel.HPicNumAssemble = "";
+ BillNew.omodel.HMaterTexture = "";
+ BillNew.omodel.HProductNum = "";
+ BillNew.omodel.HVerNum = "";
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl=new List<Model.ClsSc_ProcessExchangeBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
@@ -1383,6 +1421,14 @@
oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWWOrderBillNoCol].Value);
oSub.HPrevSourceInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPrevSourceInterIDCol].Value);
oSub.HPrevSourceEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPrevSourceEntryIDCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
+
+ oSub.HOverRate = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HOverRateCol].Value);
+ oSub.HMaxQty = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HMaxQtyCol].Value);
+ oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
+ oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
+ oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
BillNew.DetailColl.Add(oSub);
}
}
@@ -1431,7 +1477,7 @@
{
//
- grdMain.ColumnCount = 71; //鎬诲垪鏁�
+ grdMain.ColumnCount = 78; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//=
grdMain.Columns[HProcNoCol].HeaderText = "宸ュ簭鍙�";
@@ -1493,7 +1539,15 @@
grdMain.Columns[HPassRateCol].HeaderText = "鑹巼";
grdMain.Columns[HSumPassRateCol].HeaderText = "绱鑹巼";
+ grdMain.Columns[HMouldNoCol].HeaderText = "妯″叿缂栧彿";
+ grdMain.Columns[HProcWorkNumCol].HeaderText = "绋嬪簭鍙�";
grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
+
+ grdMain.Columns[HTechnologyParameterCol].HeaderText = "宸ヨ壓鍙傛暟";
+ grdMain.Columns[HPicNumCol].HeaderText = "鍥剧焊缂栧彿";
+ grdMain.Columns[HProcCheckNoteCol].HeaderText = "鏈伐搴忕‘璁よ褰�";
+ grdMain.Columns[HOverRateCol].HeaderText = "瓒呴姣斾緥";
+ grdMain.Columns[HMaxQtyCol].HeaderText = "鏈�楂樹笂闄�";
////鍥哄畾璧嬪��=====================================================
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
--
Gitblit v1.9.1