YqnMes.git - Gitblit

parent: abfaed50 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

ouyangqing

2021-02-06 4fa6d43995d10207dd084b27b3c9565d82ac517d

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

4个文件已修改

	SCM/公用类/Cls_S_CLD_ICMOList.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SCM/单据资料/Sc_ICMOReportToBarCode.cs	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SCM/单据资料/Sc_PackUnionBill.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SCM/生产管理/Sc_PackUnionBillList.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 SCM/¹«ÓÃÀà/Cls_S_CLD_ICMOList.cs

@@ -16,6 +16,7 @@
            base.sCondtion = "  ";
            base.sOrderSql = "  order by åæ®å· desc,hsubid ";
            base.sKeyCol = "è½¦é´";
             
        }
        //
 

 SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs

@@ -429,7 +429,9 @@
                double HSumQty = 0;         //äº§åæ°é

                double HMinQty = 0;         //æå°åè£æ°

                int HBQty = 0;              //ç®±æ°

                double HQty = 0;            //æ°é

                double HQty = 0;            //æ°éï¼æ åç±³æ°ï¼

                double HRelDiffQty = 0;     //å®éæè

                double HRelQty = 0;         //å®éç±³æ°

                string WeiShu = "";         //å°¾æ°

                int LSH = 0;                //æµæ°´å·

                string LSH2 = "";           //æµæ°´å·è½¬æ¢æåç¬¦

@@ -453,7 +455,7 @@
                string HBatchNo2 = "";

                Int64 HSupID = 0;

                Int64 HGroupID = 0;

                int HPrintQty = 0;

                double HPrintQty = 0;

                Int64 HBarcodeNo = 0;       //æå·

                Int64 HBarcodeQtys = 0;     //æ»ææ°

                Int64 HDeptID = 0;

@@ -529,8 +531,38 @@
                    cmdHSaveBill.Enabled = true;

                    return false;

                }

                //

                //è·åæ°éï¼ éå®è£åæ°éä¸ºè®¢åæ°éå³æºåæ°éï¼  
                if (HSourceBillType == "çäº§è®¢å") //éå®è£å

                {

                    //è£åç±³æ° å¿é¡»å¤§äº è®¢åç±³æ°

                    if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSYQty.Text) < 0)

                    {

                        MessageBox.Show("å®éç±³æ°å¿é¡»å¤§äºè®¢åç±³æ°ï¼");

                        cmdHSaveBill.Enabled = true;

                        return false;

                    }

                    //è£åä¸æ¬¡æ§å¶

                    if (DBUtility.ClsPub.isDoule(txtHRelationQty.Text) >0)

                    {

                        MessageBox.Show("åªè½è£åä¸æ¬¡ï¼ä¸è½éå¤è£åï¼");

                        cmdHSaveBill.Enabled = true;

                        return false;

                    }

                    //å½å®éç±³æ° å¤§äº è®¢åç±³æ° 0.2ä»¥ä¸æ¶ï¼æç¤ºæ¯å¦å¼ºå¶ä¿å

                    if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSYQty.Text) > 0.2)

                    {

                        if (MessageBox.Show("å®éç±³æ°å¤§äºè®¢åç±³æ°0.2ç±³ä»¥ä¸,ç¡®å®è¦ç»§ç»ä¿åï¼", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)

                        {





                        }

                        else

                        { 
                            cmdHSaveBill.Enabled = true;

                            return false;

                        }

                    }

                }

                //æ ¹æ®æºå çææ¡å½¢ç  å¹¶ä¿åå¦æ°æ®åº

                HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);

                HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);

@@ -562,8 +594,21 @@
                Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sTMNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//è·åæå¤§æµæ°´å·

                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);



                //

                HQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);

                //è·åæ°éï¼ éå®è£åæ°éä¸ºè®¢åæ°éå³æºåæ°éï¼  
                if (HSourceBillType == "çäº§è®¢å") //éå®è£å

                {

                    HQty = DBUtility.ClsPub.isDoule(txtHSumQty.Text);

                    HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);

                    HPrintQty = HRelQty;

                    HRelDiffQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSumQty.Text);

                }

                else

                {

                    HQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);

                    HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);

                    HPrintQty = HRelQty;

                    HRelDiffQty = 0;

                }

                //

                string sSQLNoMul = " exec h_p_WMS_SetMaxNo '" + sTMNumber + "' ";

                oWeb.getRunProc(sSQLNoMul, ref DBUtility.ClsPub.sExeReturnInfo);

@@ -601,7 +646,7 @@
                HUnitID = DBUtility.ClsPub.isLong(txtHUnitName.Tag);

                HQty2 = HQty;

                //HBatchNo2 = HBatchNo;

                if (HSourceBillType == "çäº§è®¢å")

                if (HSourceBillType == "çäº§è®¢å") //éå®è£å

                {

                    HBatchNo2 = HBatchNo;

                }

@@ -677,7 +722,7 @@
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HBadReasonList,HProdLev " +

                            ") values ("

                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()

                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()

                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HRelDiffQty.ToString()

                            + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillTypeID + "','" + HWei + "'"

                            + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"

                            + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HJiaYe2 + "'"

@@ -687,7 +732,11 @@
                            + ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)

                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','" + HRemark + "')";

                oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);



                //å°è£åæ¶é´åå éå®è®¢å   è£åæ¶é´å å®éæèæ°é

                if (HSourceBillType == "çäº§è®¢å") //éå®è£å

                {

                    oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToSeOrderCutTime  " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "'," + HRelDiffQty.ToString() , ref DBUtility.ClsPub.sExeReturnInfo);

                }



                //å·æ°çé¢

                DisplayMain();


 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.cs

@@ -379,7 +379,7 @@
                            ",HLogo,HPackageSize,HMaterialJQty,HMaterialMQty,HCustomBatchNo " +
                            ",HSTOCKORGID,HOWNERID,HBeginDate,HSeOrderBillNo,HGBBarCode " +
                            ",POOrderBillNo " +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo " +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInterID " +
                            ") values ("
                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -390,9 +390,12 @@
                            + ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"
                            + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"
                            + ",'" + POOrderBillNo + "'"
                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "')";
                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "',"+ omodel.HInterID + ")";
                oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);

                //å°åè£æ¶é´åå éå®è®¢å     
                oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToSeOrderPickTime  " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                

                //å·æ°çé¢
                DisBillEntryList_Webs();
@@ -422,8 +425,14 @@

        private void Sub_SetReport(string sOpenTmp)
        {
            //å¤æè¡æ°

            //å¢å å¤æï¼å¦æåè¡¨è¡ å®éæ°éä¸º0 åä¸æå°åºæ¥
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (ClsPub.isDoule(grdMain.Rows[i].Cells["æ°é"].Value) != 0)
                {
                    grdMain.Rows[i].Cells[0].Value = "*";
                }
            }
            Report = new GridppReport();
            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
@@ -443,7 +452,12 @@
                Report.FieldByName("èç³»æ¹å¼").AsString = ClsPub.isStrNull(txtHLinkMan.Text)+ "-" +  ClsPub.isStrNull(txtHLinkPhone.Text);
                Report.FieldByName("å°å").AsString = ClsPub.isStrNull(txtHAddress.Text);
                Report.FieldByName("ç©æµæ¹å¼").AsString = ClsPub.isStrNull(txtHConveyCompName.Text);
                //Report.FieldByName("æ»éé").AsString = ClsPub.isStrNull(txtHWeight.Text);
                string HWeight = ClsPub.isStrNull(txtHWeight.Text);
                if (HWeight==null || HWeight.Equals(""))
                {
                    HWeight = "0";
                }
                Report.FieldByName("æ»éé").AsString = HWeight;
            }
            catch (Exception e)
            {
@@ -456,7 +470,7 @@
            try
            {
                DataTable ds = new DataTable();
                BLL.Utility.FillRecordToReport(Report, grdMain, ds, 0);
                BLL.Utility.FillRecordToReport(Report, grdMain, ds, Fun_GetCol("éæ©"));
            }
            catch (Exception e)
            {

 SCM/Éú²ú¹ÜÀí/Sc_PackUnionBillList.cs

@@ -180,15 +180,15 @@
                        sHInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
                        oWeb.getRunProc("Delete from Sc_PackUnionBillSub where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                        oWeb.getRunProc("Delete from Sc_PackUnionBillMain where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                        oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','å é¤åæ®ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºååå·")].Value) + "' ,'çäº§åè£ååè¡¨','','å é¤')", ref DBUtility.ClsPub.sExeReturnInfo);
                        oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','å é¤åæ®ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + "' ,'çäº§åè£ååè¡¨','','å é¤')", ref DBUtility.ClsPub.sExeReturnInfo);
                        MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + " å é¤æåï¼", "æç¤º");
                    }
                }
                MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºååå·")].Value) + " å é¤æåï¼", "æç¤º");
                Display();
            }
            catch (Exception e)
            {
                throw (e);
                MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + " å é¤å¤±è´¥ï¼"+e.ToString(), "æç¤º");
            }
        }

@@ -267,7 +267,7 @@
                //Report.FieldByName("å¶åæ¥æ").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("å¶åæ¥æ")].Value);
                Report.FieldByName("æºååå·").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value);
                //Report.FieldByName("æºåç±»å").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºåç±»å")].Value);
                Report.FieldByName("æ»éé").AsString = DBUtility.ClsPub.isStrNull(AllQty);
                Report.FieldByName("æ»éé").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æ»éé")].Value);
                AllQty = 0;
            }
            catch (Exception e)

			@@ -16,6 +16,7 @@
			base.sCondtion = " ";
			base.sOrderSql = " order by åæ®å· desc,hsubid ";
			base.sKeyCol = "è½¦é´";

			}
			//

			@@ -429,7 +429,9 @@
			double HSumQty = 0; //äº§åæ°é
			double HMinQty = 0; //æå°åè£æ°
			int HBQty = 0; //ç®±æ°
			double HQty = 0; //æ°é
			double HQty = 0; //æ°éï¼æ åç±³æ°ï¼
			double HRelDiffQty = 0; //å®éæè
			double HRelQty = 0; //å®éç±³æ°
			string WeiShu = ""; //å°¾æ°
			int LSH = 0; //æµæ°´å·
			string LSH2 = ""; //æµæ°´å·è½¬æ¢æåç¬¦
			@@ -453,7 +455,7 @@
			string HBatchNo2 = "";
			Int64 HSupID = 0;
			Int64 HGroupID = 0;
			int HPrintQty = 0;
			double HPrintQty = 0;
			Int64 HBarcodeNo = 0; //æå·
			Int64 HBarcodeQtys = 0; //æ»ææ°
			Int64 HDeptID = 0;
			@@ -529,8 +531,38 @@
			cmdHSaveBill.Enabled = true;
			return false;
			}
			//
			//è·åæ°éï¼ éå®è£åæ°éä¸ºè®¢åæ°éå³æºåæ°éï¼
			if (HSourceBillType == "çäº§è®¢å") //éå®è£å
			{
			//è£åç±³æ° å¿é¡»å¤§äº è®¢åç±³æ°
			if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSYQty.Text) < 0)
			{
			MessageBox.Show("å®éç±³æ°å¿é¡»å¤§äºè®¢åç±³æ°ï¼");
			cmdHSaveBill.Enabled = true;
			return false;
			}
			//è£åä¸æ¬¡æ§å¶
			if (DBUtility.ClsPub.isDoule(txtHRelationQty.Text) >0)
			{
			MessageBox.Show("åªè½è£åä¸æ¬¡ï¼ä¸è½éå¤è£åï¼");
			cmdHSaveBill.Enabled = true;
			return false;
			}
			//å½å®éç±³æ° å¤§äº è®¢åç±³æ° 0.2ä»¥ä¸æ¶ï¼æç¤ºæ¯å¦å¼ºå¶ä¿å
			if (DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSYQty.Text) > 0.2)
			{
			if (MessageBox.Show("å®éç±³æ°å¤§äºè®¢åç±³æ°0.2ç±³ä»¥ä¸,ç¡®å®è¦ç»§ç»ä¿åï¼", "æç¤º", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
			{


			}
			else
			{
			cmdHSaveBill.Enabled = true;
			return false;
			}
			}
			}
			//æ ¹æ®æºå çææ¡å½¢ç å¹¶ä¿åå¦æ°æ®åº
			HNumber = DBUtility.ClsPub.isStrNull(txtHMaterName.Tag);
			HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
			@@ -562,8 +594,21 @@
			Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);

			//
			HQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);
			//è·åæ°éï¼ éå®è£åæ°éä¸ºè®¢åæ°éå³æºåæ°éï¼
			if (HSourceBillType == "çäº§è®¢å") //éå®è£å
			{
			HQty = DBUtility.ClsPub.isDoule(txtHSumQty.Text);
			HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);
			HPrintQty = HRelQty;
			HRelDiffQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text) - DBUtility.ClsPub.isDoule(txtHSumQty.Text);
			}
			else
			{
			HQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);
			HRelQty = DBUtility.ClsPub.isDoule(txtHSJQty.Text);
			HPrintQty = HRelQty;
			HRelDiffQty = 0;
			}
			//
			string sSQLNoMul = " exec h_p_WMS_SetMaxNo '" + sTMNumber + "' ";
			oWeb.getRunProc(sSQLNoMul, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -601,7 +646,7 @@
			HUnitID = DBUtility.ClsPub.isLong(txtHUnitName.Tag);
			HQty2 = HQty;
			//HBatchNo2 = HBatchNo;
			if (HSourceBillType == "çäº§è®¢å")
			if (HSourceBillType == "çäº§è®¢å") //éå®è£å
			{
			HBatchNo2 = HBatchNo;
			}
			@@ -677,7 +722,7 @@
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HBadReasonList,HProdLev " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HRelDiffQty.ToString()
			+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillTypeID + "','" + HWei + "'"
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HJiaYe2 + "'"
			@@ -687,7 +732,11 @@
			+ ",'" + POOrderBillNo + "'" + "," + DBUtility.ClsPub.isLong(txtHSourceID.Tag)
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + txtHReasonList.Text + "','" + HRemark + "')";
			oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);

			//å°è£åæ¶é´åå éå®è®¢å è£åæ¶é´å å®éæèæ°é
			if (HSourceBillType == "çäº§è®¢å") //éå®è£å
			{
			oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToSeOrderCutTime " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "'," + HRelDiffQty.ToString() , ref DBUtility.ClsPub.sExeReturnInfo);
			}

			//å·æ°çé¢
			DisplayMain();

			@@ -379,7 +379,7 @@
			",HLogo,HPackageSize,HMaterialJQty,HMaterialMQty,HCustomBatchNo " +
			",HSTOCKORGID,HOWNERID,HBeginDate,HSeOrderBillNo,HGBBarCode " +
			",POOrderBillNo " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInterID " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
			@@ -390,9 +390,12 @@
			+ ",'" + HLogo + "','" + HPackageSize + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + ",'" + HCustomBatchNo + "'"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HBeginDate.ToShortDateString() + "','" + HSeOrderBillNo + "','" + HGBBarCode + "'"
			+ ",'" + POOrderBillNo + "'"
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "')";
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "',"+ omodel.HInterID + ")";
			oWeb.getRunProc(sSQLMul, ref DBUtility.ClsPub.sExeReturnInfo);

			//å°åè£æ¶é´åå éå®è®¢å
			oWeb.getRunProc("EXEC h_p_IFCLD_DataBackToSeOrderPickTime " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);


			//å·æ°çé¢
			DisBillEntryList_Webs();
			@@ -422,8 +425,14 @@

			private void Sub_SetReport(string sOpenTmp)
			{
			//å¤æè¡æ°

			//å¢å å¤æï¼å¦æåè¡¨è¡ å®éæ°éä¸º0 åä¸æå°åºæ¥
			for (int i = 0; i < grdMain.RowCount; i++)
			{
			if (ClsPub.isDoule(grdMain.Rows[i].Cells["æ°é"].Value) != 0)
			{
			grdMain.Rows[i].Cells[0].Value = "*";
			}
			}
			Report = new GridppReport();
			Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
			Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
			@@ -443,7 +452,12 @@
			Report.FieldByName("èç³»æ¹å¼").AsString = ClsPub.isStrNull(txtHLinkMan.Text)+ "-" + ClsPub.isStrNull(txtHLinkPhone.Text);
			Report.FieldByName("å°å").AsString = ClsPub.isStrNull(txtHAddress.Text);
			Report.FieldByName("ç©æµæ¹å¼").AsString = ClsPub.isStrNull(txtHConveyCompName.Text);
			//Report.FieldByName("æ»éé").AsString = ClsPub.isStrNull(txtHWeight.Text);
			string HWeight = ClsPub.isStrNull(txtHWeight.Text);
			if (HWeight==null \|\| HWeight.Equals(""))
			{
			HWeight = "0";
			}
			Report.FieldByName("æ»éé").AsString = HWeight;
			}
			catch (Exception e)
			{
			@@ -456,7 +470,7 @@
			try
			{
			DataTable ds = new DataTable();
			BLL.Utility.FillRecordToReport(Report, grdMain, ds, 0);
			BLL.Utility.FillRecordToReport(Report, grdMain, ds, Fun_GetCol("éæ©"));
			}
			catch (Exception e)
			{

			@@ -180,15 +180,15 @@
			sHInterID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("HInterID")].Value);
			oWeb.getRunProc("Delete from Sc_PackUnionBillSub where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			oWeb.getRunProc("Delete from Sc_PackUnionBillMain where HInterID=" + sHInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','å é¤åæ®ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºååå·")].Value) + "' ,'çäº§åè£ååè¡¨','','å é¤')", ref DBUtility.ClsPub.sExeReturnInfo);
			oWeb.getRunProc("insert into System_log values(GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.CurUserName + "','å é¤åæ®ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + "' ,'çäº§åè£ååè¡¨','','å é¤')", ref DBUtility.ClsPub.sExeReturnInfo);
			MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + " å é¤æåï¼", "æç¤º");
			}
			}
			MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºååå·")].Value) + " å é¤æåï¼", "æç¤º");
			Display();
			}
			catch (Exception e)
			{
			throw (e);
			MessageBox.Show("åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value) + " å é¤å¤±è´¥ï¼"+e.ToString(), "æç¤º");
			}
			}

			@@ -267,7 +267,7 @@
			//Report.FieldByName("å¶åæ¥æ").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("å¶åæ¥æ")].Value);
			Report.FieldByName("æºååå·").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("çäº§è®¢åå·")].Value);
			//Report.FieldByName("æºåç±»å").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æºåç±»å")].Value);
			Report.FieldByName("æ»éé").AsString = DBUtility.ClsPub.isStrNull(AllQty);
			Report.FieldByName("æ»éé").AsString = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[Fun_GetCol("æ»éé")].Value);
			AllQty = 0;
			}
			catch (Exception e)