Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2022-04-19 22eec752e72650a42c7208397fefdcb0e61a749d

 WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs

@@ -107,6 +107,7 @@
            DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HSeOrderBillNo + "' ,'" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
            if (DSet == null)
                //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
            {
                MessageBox.Show("没有返回任何结果,请在过滤框中点击【恢复】按钮,尝试再次查询！" + DBUtility.ClsPub.sExeReturnInfo);
                return;
@@ -118,6 +119,7 @@
                if (DSet.Tables[0].Rows.Count > 0)
                {
                    txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
                    txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["标准装箱"].Value);
                }
                else
                {
@@ -219,6 +221,12 @@
            initGrid();
            cmbHBarCodeType.SelectedIndex = 0;
            dtpHBeginDate.Value = DateTime.Today;
            string HUserName = "";
            HUserName = ClsPub.isStrNull(DBUtility.ClsPub.CurUserName);
            Int64 HUserID = 0;
            HUserID = ClsPub.isInt(DBUtility.ClsPub.CurUserID);
            txtHEmpID.Text = HUserName;
            txtHEmpID.Tag = HUserID;
        }

        private void grdMain_DblClick(object sender, EventArgs e)
@@ -495,14 +503,14 @@
        private void Sub_SetReport(string sOpenTmp)
        {
            //判断行数
            for (int i = 0; i < grdList.Rows.Count; i++)
            {
                grdList.Rows[i].Cells[0].Value = "";
            }
            for (int i = 0; i < grdList.SelectedRows.Count; i++)
            {
                grdList.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
            }
            //for (int i = 0; i < grdList.Rows.Count; i++)
            //{
            //    grdList.Rows[i].Cells[0].Value = "";
            //}
            //for (int i = 0; i < grdList.SelectedRows.Count; i++)
            //{
            //    grdList.Rows[grdMain.SelectedRows[i].Index].Cells[0].Value = "*";
            //}
            //
            Report = new GridppReport();
            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
@@ -910,6 +918,11 @@
                        string HWorkLineName = "";
                        string HSeOrderBillNo = "";
                        string HInnerBillNo = "";
                        Int64 HSourceID = 0;
                        //毛重
                        Double HMZQty = 0;
                        HMZQty = HZXQty * ClsPub.isDoule(grdMain.Rows[j].Cells[Fun_GetCol("克重")].Value)/1000;

                        HWei = WeiShu;
                        HBarCode = TM;
                        HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
@@ -939,20 +952,21 @@
                        HWorkLineName = "";
                        HSeOrderBillNo = "";
                        HInnerBillNo = sPackBarCode;
                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                        HSourceID = ClsPub.isInt(txtHSourceID.Tag);
                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HMaterialMQty" +
                                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
                                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
                                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
                                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
                                            ") values ("
                                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
                                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
                                            + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
                                            + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                            + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
                                            + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
                                            + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
                                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");

                        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
@@ -968,7 +982,7 @@


                sPackBarCode = "";
                DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹ = '托盘条码' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
                DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_CS Where HInterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹ = '托盘条码'", "h_v_IF_BarCodeBillList_CS", ref DBUtility.ClsPub.sExeReturnInfo);
                //生成首行标题
                if (DSet == null)
                {
@@ -977,6 +991,7 @@
                }
                //
                grdList.DataSource = DSet.Tables[0].DefaultView;
                txtHZXQty.Text = "";
                //冻结
                int FrCol = 0;
                string s = "是";
@@ -995,7 +1010,7 @@
                //0结束事务

                //
                Display();
                //Display();
               

            }
@@ -1012,22 +1027,30 @@
        {
            
            //根据本箱数量 æ¥ åˆ†é…åˆ° æ¯ä¸ªç”Ÿäº§è®¢å•ä¸Šï¼ˆåˆ†é…æ—¶ è¦è€ƒè™‘ è®¢å•å‰©ä½™æ•°é‡å·²ç»æ˜¯ è´Ÿæ•°çš„情况）
            //1.判断本箱数量 å¿…须大于0
            //如果有标准装箱数量 å…ˆé»˜è®¤å–标准装箱数量  æ²¡æœ‰å†å–手输的本箱数量
            //1.判断本箱数量 å¿…须大于0   
            double HZXQty = 0;//整箱数量
            HZXQty = ClsPub.isDoule(txtHZXQty.Text);
            if (txtHZXQty.Text.Trim() != "")
            {
                HZXQty = ClsPub.isDoule(txtHZXQty.Text);
            }
            else
            {
                HZXQty = ClsPub.isDoule(txtHMiniQty.Text);
            }
            if (HZXQty <= 0)
            {
                MessageBox.Show("请输入整箱数量！");
                return;
            }
            //2.刷新网格
            Display();
            //Display();
            //3.把整箱数量 åˆ†é…åˆ° ç½‘格下面的每一个 ç”Ÿäº§è®¢å•ä¸ŠåŽ»ã€‚  å¾ªçŽ¯ç½‘æ ¼
            for(int i =0;i<grdMain.Rows.Count;i++)
            {
                if(HZXQty>0)
                if (HZXQty > 0)
                {
                    if(HZXQty>DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value))
                    if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value))
                    {
                        HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);
                        grdMain.Rows[i].Cells["本次数量"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);
@@ -1701,18 +1724,48 @@

        private void cmdHSourceID_Click(object sender, EventArgs e)
        {
            Int64 HEmpID = 0;
            HEmpID = ClsPub.isLong(txtHEmpID.Tag);
            string HEmpName = "";
            HEmpName = ClsPub.isStrNull(txtHEmpID.Text);

            DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
            if (oSource.RefreshView())
            if (HEmpName != "")
            {
                this.txtHSourceID.Text = oSource.oModel.HName;
                this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
                //
                Display();
                if (oSource.GetInfoByID(HEmpID))
                {
                    this.txtHSourceID.Text = oSource.oModel.HName;
                    this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
                    //
                    Display();
                }
                else
                {
                    this.txtHSourceID.Text = "";
                }
            }
            else
            {
                this.txtHSourceID.Text = "";

                if (oSource.RefreshView())
                {
                    this.txtHSourceID.Text = oSource.oModel.HName;
                    this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
                    //
                    Display();
                }
                else
                {
                    this.txtHSourceID.Text = "";
                }
            }
            //if (oSource.RefreshView())
            //{
            //    this.txtHSourceID.Text = oSource.oModel.HName;
            //    this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
            //    //
            //    Display();
            //}

            //DAL.ClsGy_WorkCenter_View oWork = new DAL.ClsGy_WorkCenter_View();
            //if (oWork.RefreshView())
@@ -1907,14 +1960,29 @@
            DataSet DSBefore;
            DSBefore =  SubCn.RunProcReturn("exec h_p_PreviousMater "+ HInterID, "h_p_PreviousMater", ref DBUtility.ClsPub.sExeReturnInfo);
            grdMain.DataSource = DSBefore.Tables[0].DefaultView;
            if (DSBefore.Tables[0].Rows.Count > 0)
            //if (DSBefore.Tables[0].Rows.Count > 0)
            //{
            //    txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
            //}
            //else
            //{

            //}
            if (DSBefore == null || DSBefore.Tables[0].Rows.Count == 0)
            //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
            {
                txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
                MessageBox.Show("没有上一个物料,如果需要请找机修！" + DBUtility.ClsPub.sExeReturnInfo);
                return;
            }
            else
            {

                grdMain.DataSource = DSBefore.Tables[0].DefaultView;
                txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
                txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["标准装箱"].Value);
            }



        }

        private void button3_Click(object sender, EventArgs e)
@@ -1925,9 +1993,19 @@
            HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
            DataSet DSBefore;
            DSBefore = SubCn.RunProcReturn("exec h_p_NextMater " + HInterID, "h_p_NextMater", ref DBUtility.ClsPub.sExeReturnInfo);
            grdMain.DataSource = DSBefore.Tables[0].DefaultView;
            txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
            txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
            if (DSBefore == null || DSBefore.Tables[0].Rows.Count == 0)
            //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)
            {
                MessageBox.Show("没有下一个物料,如果需要请找机修！" + DBUtility.ClsPub.sExeReturnInfo);
                return;
            }
            else
            {
                grdMain.DataSource = DSBefore.Tables[0].DefaultView;
                txtHMaterID.Tag = DBUtility.ClsPub.isInt(grdMain.Rows[0].Cells["HInterID"].Value);
                txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["标准装箱"].Value);
            }
            //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
        }

        //超额打印
@@ -1943,7 +2021,7 @@
                return;
            }
            //2.刷新网格
            Display();
            //Display();
            //3.循环网格，累计全部剩余数量，判断是否 å‰©ä½™æ•°é‡ å°äºŽ æœ¬ç®±æ•°é‡ï¼›å¦‚æžœ å¤§äºŽåˆ™æŠ¥é”™ é€€å‡ºã€‚
            double sumLeftQty = 0;
            for (int i = 0; i < grdMain.Rows.Count; i++)