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

yusijie

2022-12-22 7f3034113076f4a599ac2c6e1d14b7ddd0f57788

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

@@ -121,6 +121,9 @@
                {
                    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["物料编码"].Value);
                    txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["规格型号"].Value);
                    txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["物料名称"].Value);
                }
                else
                {
@@ -752,7 +755,6 @@

        private void cmdHSaveBill_Click(object sender, EventArgs e)
        {

            Display();
        }

@@ -875,17 +877,32 @@
                long HTMaterID = 0;
                HTMaterID = ClsPub.isLong(grdMain.Rows[0].Cells[Fun_GetCol("HMaterID")].Value);
                string sPackStr = "ZXM" + HYear + HPeriod + HDay + HTMaterID; //外箱码 å‰ç¼€


                //获取处理过的日期跟今天差几天  ç„¶åŽåŠ å‡ ä¸ª+号
                TimeSpan HCY = Convert.ToDateTime(HPrdDate) - Convert.ToDateTime(DateTime.Now.ToString());
                int a = 1;
                while (a <= HCY.Days)  //当a å°äºŽ å·®å¼‚天数  å¾ªçŽ¯åŠ ä¸Š + å·
                {
                    HPrdDate = HPrdDate + "+";
                    a = a + 1;
                }
                DataSet DsTM = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                Int64 TTM_LSH = ClsPub.isInt(DsTM.Tables[0].Rows[0][0]) + 1;
                DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
                {
                    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
                }
                else
                {
                    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
                }


                sPackBarCode = sPackStr + TTM_LSH.ToString();
                //DataSet DSet3 = oCn.RunProcReturn("select * from Gy_FactoryDayOff Where HFactoryDayOffDate='" + HDate1.ToString() + "'", "Gy_FactoryDayOff", ref DBUtility.ClsPub.sExeReturnInfo);
                //if (DSet3 == null || DSet3.Tables[0].Rows.Count == 0)
                //{
                //    sPackBarCode = sPackStr + TTM_LSH.ToString() ;
                //}
                //else
                //{
                //    sPackBarCode = sPackStr + TTM_LSH.ToString() + "+";
                //}


                oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");


@@ -978,7 +995,7 @@
                        HJT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[Fun_GetCol("设备")].Value);
                        HXH = HYear + HPeriod + HDay + HBC + HJT + HMaterNumber;
                        Ds99 = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HXH + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                        LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]);
                        LSH3 = ClsPub.isInt(Ds99.Tables[0].Rows[0][0]) + 1;
                        LSH4 = LSH3.ToString();


@@ -1197,19 +1214,70 @@
            //Sub_SaveBarCode();
            ////



            //bool flag = this.txtHZXQty.Text.Trim() != "";
            //double num;
            //double HICMOQty = 0;
            //if (flag)
            //{
            //    num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
            //}
            //else
            //{
            //    num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
            //}
            //bool flag2 = num <= 0.0;
            //if (flag2)
            //{
            //    MessageBox.Show("请输入整箱数量！");
            //}
            //else
            //{
            //    for (int i = 0; i < this.grdMain.Rows.Count; i++)
            //    {
            //        for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
            //        {

            //            HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["生产订单数量"].Value);
            //        }
            //        if (HICMOQty < num)
            //        {
            //            MessageBox.Show("请点击超额生产按钮生成条码！");
            //            break;
            //        }

            //        bool flag3 = num > 0.0;
            //        if (!flag3)
            //        {
            //            break;
            //        }
            //        bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
            //        if (!flag4)
            //        {
            //            this.grdMain.Rows[i].Cells["本次数量"].Value = num;
            //            break;
            //        }
            //        num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
            //        this.grdMain.Rows[i].Cells["本次数量"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
            //    }
            //    this.Sub_SaveBarCode();

            bool flag = this.txtHZXQty.Text.Trim() != "";
            double HICMOQty = 0.0;
            bool flag5 = flag;
            double num;
            double HICMOQty = 0;
            if (flag)
            if (flag5)
            {
                num = Pub_Class.ClsPub.isDoule(this.txtHZXQty.Text);
                num = ClsPub.isDoule(this.txtHZXQty.Text);
            }
            else
            {
                num = Pub_Class.ClsPub.isDoule(this.txtHMiniQty.Text);
                num = ClsPub.isDoule(this.txtHMiniQty.Text);
            }
            bool flag2 = num <= 0.0;
            if (flag2)
            bool flag6 = flag2;
            if (flag6)
            {
                MessageBox.Show("请输入整箱数量！");
            }
@@ -1217,30 +1285,31 @@
            {
                for (int i = 0; i < this.grdMain.Rows.Count; i++)
                {
                    for (int i1 = 0; i1 < this.grdMain.Rows.Count; i1++)
                    for (int i2 = 0; i2 < this.grdMain.Rows.Count; i2++)
                    {

                        HICMOQty += Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i1].Cells["生产订单数量"].Value);
                        HICMOQty += ClsPub.isDoule(this.grdMain.Rows[i2].Cells["生产订单数量"].Value);
                    }
                    if (HICMOQty < num)
                    bool flag7 = HICMOQty < num;
                    if (flag7)
                    {
                        MessageBox.Show("请点击超额生产按钮生成条码！");
                        break;
                    }

                    bool flag3 = num > 0.0;
                    if (!flag3)
                    bool flag8 = !flag3;
                    if (flag8)
                    {
                        break;
                    }
                    bool flag4 = num > Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                    if (!flag4)
                    bool flag4 = num > ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                    bool flag9 = !flag4;
                    if (flag9)
                    {
                        this.grdMain.Rows[i].Cells["本次数量"].Value = num;
                        break;
                    }
                    num -= Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                    this.grdMain.Rows[i].Cells["本次数量"].Value = Pub_Class.ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                    num -= ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                    this.grdMain.Rows[i].Cells["本次数量"].Value = ClsPub.isDoule(this.grdMain.Rows[i].Cells["生产订单数量"].Value);
                }
                this.Sub_SaveBarCode();
            }
@@ -2063,6 +2132,8 @@
                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);
                txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["规格型号"].Value);
                txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["物料名称"].Value);
            }


@@ -2088,6 +2159,8 @@
                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);
                txtHMaterModel.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["规格型号"].Value);
                txtHMaterName.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["物料名称"].Value);
            }
            //txtHMaterID.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells["HInterID"].Value);
        }
@@ -2191,5 +2264,10 @@
                Thread.Sleep(1000); 
            }
        }

        private void label14_Click(object sender, EventArgs e)
        {

        }
    }
}