yxj
2024-10-17 7322ee0214aef918b4a99e51c109867848149522
WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs
@@ -828,7 +828,7 @@
            //选单按钮显示
            if (num == 3)
            {
                if (HSNo != 0 && (HMaterID != DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterID")].Value)
                if (HBarCode_Pack != "" && (HMaterID != DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterID")].Value)
                    || HBatchNo != DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("批号")].Value)))
                {
                    MessageBox.Show("所扫描流转卡对应物料、批号与当前正在组托物料、批号不一致,不同物料、批号不允许组托在同一托上,如需换物料生成条码请先结束当前组托!", "提示");
@@ -1388,7 +1388,8 @@
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("条码类型")].Value) == "唯一条码"
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack)
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("作废标记")].Value) == "")
                {
                    b = true;
                    break;