From d6b40e55405f2814e4663a3a4e537de57c48c20f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 11 八月 2022 19:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 9df12ad..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"
@@ -93,6 +93,11 @@
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
@@ -1295,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++)
@@ -1387,7 +1422,13 @@
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.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);
}
}
@@ -1436,7 +1477,7 @@
{
//
- grdMain.ColumnCount = 73; //鎬诲垪鏁�
+ grdMain.ColumnCount = 78; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//=
grdMain.Columns[HProcNoCol].HeaderText = "宸ュ簭鍙�";
@@ -1501,6 +1542,12 @@
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