最小包装仪器

jingh

2021-12-31 3a9bb470769f37002e4418f1463e330b4e119343

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

@@ -704,7 +704,7 @@
                    //日期获取方式
                    sDate = dtpHDate.Value.ToShortDateString();
                    //
                    if (cmbHBarCodeType.Text == "仪器外购件条码普通规则") //单据日期(收料通知单)
                    if (cmbHBarCodeType.Text == "仪器外购件条码普通规则" || cmbHBarCodeType.Text == "仪器外购件条码容器规则") //单据日期(收料通知单)
                    {
                        sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
                    }
@@ -776,7 +776,7 @@
                    {
                        TM = HOrgNumber + HNumber + HBatchNo;
                    }//博日特殊处理
                    else if(cmbHBarCodeType.Text == "仪器外购件条码普通规则")
                    else if(cmbHBarCodeType.Text == "仪器外购件条码普通规则" || cmbHBarCodeType.Text == "仪器外购件条码容器规则")
                    {
                        //物料编码+单据日期（YYMMDD）+流水4位 
                        sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
@@ -875,7 +875,7 @@
                            //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·
                            TM = sTMNumber + LSH2;
                        }
                        else if(cmbHBarCodeType.Text == "仪器外购件条码普通规则" || cmbHBarCodeType.Text == "试剂成品条码规则" 
                        else if(cmbHBarCodeType.Text == "仪器外购件条码普通规则" || cmbHBarCodeType.Text == "仪器外购件条码容器规则" || cmbHBarCodeType.Text == "试剂成品条码规则" 
                            || cmbHBarCodeType.Text == "半成品条码" || cmbHBarCodeType.Text == "外销机条码")
                        {
                            TM = sTMNumber + LSH2;
@@ -2338,11 +2338,13 @@
            //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["生产线代码"].ToString();
            grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["生产线"].ToString();
            grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["计划完工日期"].ToString();//博日 ç”Ÿäº§è®¢å• å¤±æ•ˆæ—¥æœŸ
            if (cmbHBarCodeType.Text == "仪器外购件条码容器规则" && CampanyName == "博日科技")
            if (cmbHBarCodeType.Text == "仪器外购件条码容器规则" )
            {
                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["未生成条码数量"]);
            }
            else if (cmbHBarCodeType.Text == "仪器外购件条码普通规则" && CampanyName == "博日科技")
            else if (cmbHBarCodeType.Text == "仪器外购件条码普通规则"  
                || cmbHBarCodeType.Text == "仪器成品条码规则" 
                || cmbHBarCodeType.Text == "试剂成品条码规则")
            {
                grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
            }