zrg
8 天以前 981ea6f779477b4b729c6796cfc42ee933c781b0
WebAPI/Controllers/»ªÔ¶datamapping/HY_DataMappingController.cs
@@ -623,7 +623,7 @@
        /// <returns></returns>
        [Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
        [HttpGet]
        public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
        public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker, string HBatchNo)
        {
            try
            {
@@ -645,7 +645,7 @@
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
                ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "','" + HBatchNo + "'" , "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -1255,6 +1255,8 @@
                string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
                //根据PNL条码编号、set号,从PNL检验信息表中获取set对应的检验信息
                //string sql = "exec h_p_Gy_GetMappingData_JiGuangGe '" + HBarCode_PNL + "','" + HSetNo + "'";
                //ds = oCN.RunProcReturn(sql, "h_p_Gy_GetMappingData_JiGuangGe");
                string sql = "" +
                    "select distinct * from (" +
                    //"select HBarCode,HPCSNo from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_PNL + "' and HSetNo = '" + HSetNo + "' " +