仲国强
2021-09-01 638a507639d03270caf9118b26b77f6cc0321b6e
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
3个文件已修改
7 ■■■■ 已修改文件
BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/基础资料/BillSelect.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BLL/ϵͳ¹«ÓÃCLS/Cls_S_KF_ICInventoryList_IF.cs
@@ -31,7 +31,7 @@
        public bool Refresh(string sWhere)
        {
            string sErr = "";
            int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, MTONoCol;
            int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, AuxPropIDCol, MTONoCol;
            string stmp;
            string tSQL;
            try
@@ -44,6 +44,7 @@
                SubIDCol = oFrm.Fun_GetCol("hwhid");
                SPIDCol = oFrm.Fun_GetCol("hspid");
                BatchNoCol = oFrm.Fun_GetCol("批次");
                AuxPropIDCol = oFrm.Fun_GetCol("HAuxPropID");
                MTONoCol = oFrm.Fun_GetCol("计划跟踪号");
                //
                //循环 é€‰ä¸­è¡Œ
@@ -56,6 +57,7 @@
                        oSelect.BillSubID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
                        oSelect.SPID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SPIDCol].Value);
                        oSelect.BatchNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[BatchNoCol].Value);
                        oSelect.HAuxPropID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[AuxPropIDCol].Value);
                        oSelect.BillNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[MTONoCol].Value);
                        oSelect.BillTitle = mvarReportTitle;
                        oSelect.BillType = mvarItemKey;
DBUtility/»ù´¡×ÊÁÏ/BillSelect.cs
@@ -13,5 +13,6 @@
        public Int64 BillSubID;
        public Int64 SPID;
        public string BatchNo;
        public Int64 HAuxPropID;
    }
}
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -1781,7 +1781,7 @@
                    grdMain.Rows.Add();
                    Application.DoEvents();
                    //得到信息
                    Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and æ‰¹æ¬¡='" + oSelectRow.BatchNo + "' and è®¡åˆ’跟踪号='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
                    Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and HAuxPropID=" + oSelectRow.HAuxPropID + " and æ‰¹æ¬¡='" + oSelectRow.BatchNo + "' and è®¡åˆ’跟踪号='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
                    //写入信息
                    Sub_WriteInForm2(Ds.Tables[0], i);
                }