From 838aeffacac607ef4393128c2aca1afd6a0078c3 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期六, 20 五月 2023 04:31:47 +0800
Subject: [PATCH] 白坯发布汇总、明细报表:列宽自适应

---
 DAL/车间管理/ClsSc_ProcessExchangeBill.cs |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 5ef435e..fcb96aa 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"
@@ -87,6 +87,8 @@
                 ",HExplanation='" + omodel.HExplanation + "'" +
                 ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                 ",HSupID=" + omodel.HSupID.ToString() +
+                ",HEmpID=" + omodel.HEmpID.ToString() +
+                ",HCusID=" + omodel.HCusID.ToString() +
                 ",HMainMaterID=" + omodel.HMainMaterID.ToString() +
                 ",HKeyMaterID=" + omodel.HKeyMaterID.ToString() +
                 ",HWorkShopID=" + omodel.HWorkShopID.ToString() +
@@ -94,6 +96,7 @@
                 ",HProjectNum='" + omodel.HProjectNum.ToString() + "'" +
                 ",HMateOutBatchNo='" + omodel.HMateOutBatchNo + "'" +
                 ",HBLFlag='" + (omodel.HBLFlag ? 1 : 0) + "'" +
+                ",HMachineLine='" + omodel.HMachineLine + "'" +
                 ",HXTNumber='" + omodel.HXTNumber  + "'" +
                 ",HXTModel='" + omodel.HXTModel + "'" +
                 ",HRemark2='" + omodel.HRemark2 + "'" +
@@ -110,6 +113,8 @@
                 ",HAl1Long='" + omodel.HAl1Long + "'" +
                 ",HDensity='" + omodel.HDensity + "'" +
                 ",HTela='" + omodel.HTela + "'" +
+                ",HSplitSumQty='" + omodel.HSplitSumQty + "'" +
+                ",HSplitColorQty='" + omodel.HSplitColorQty + "'" +
                 ",HUnderTela='" + omodel.HUnderTela + "'" +
                 ",HSizing='" + omodel.HSizing + "'" +
                 ",HSellDate='" + omodel.HSellDate + "'" +
@@ -137,6 +142,7 @@
                 ",HMaterTexture='" + omodel.HMaterTexture + "'" +
                 ",HProductNum='" + omodel.HProductNum + "'" +
                 ",HVerNum='" + omodel.HVerNum + "'" +
+                ",HColorRemark='" + omodel.HColorRemark + "'" +
                 ",HWorkBillSortNo='" + omodel.HWorkBillSortNo + "'" +
                 //鍔犲叆鐢熶骇绫诲瀷
                 ",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
@@ -317,7 +323,7 @@
 ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HXTNumber,HXTModel,HWorkBillSortNo" +
                ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo" +
                ",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
-               ",HRemark2,HRemark3) " +
+               ",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine) " +
                 " 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 + "'" +
                 "," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -331,7 +337,7 @@
                 ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','" + (omodel.HBLFlag ? 1 : 0) + "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HXTNumber + "','" + omodel.HXTModel + "','" + omodel.HWorkBillSortNo + 
                 "',"+ omodel.HRoutingBillID + ",'"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +"" +
                 ",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "'" +
-                ",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "')");
+                ",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "',"+ omodel.HEmpID + "," + omodel.HCusID + ",'"+ omodel.HColorRemark + "',"+ omodel.HSplitSumQty + ","+ omodel.HSplitColorQty + ",'"+ omodel.HMachineLine + "')");
                 sErr = sErr + "1;";
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -547,6 +553,19 @@
                 omodel.HAuxQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HAuxQty"]);
                 omodel.HAuxUnit = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HAuxUnit"]);
                 omodel.HSplitNo = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSplitNo"]);
+                omodel.HRemark2 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark2"]);
+                omodel.HRemark3 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark3"]);
+                omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"].ToString());
+                omodel.HHeight = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HHeight"]);
+                omodel.HInches = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInches"]);
+                omodel.HAl1Long = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAl1Long"]);
+                omodel.HDensity = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDensity"]);
+                omodel.HTela = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HTela"]);
+                omodel.HUnderTela = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUnderTela"]);
+                omodel.HSizing = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSizing"]);
+                omodel.HSellDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSellDate"]);
+                omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"].ToString());
+                omodel.HColorRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HColorRemark"].ToString());
                 //
                 //寰幆
                 DataSet DsSub;

--
Gitblit v1.9.1