职员列表 修复日期类型前端传入值为空时转换失败问题 修复数据库事务开启 回滚和提交 生命周期混乱导致的死锁问题

chenhaozhe

4 小时以前 fb59a056dc4ca2ed5634fe312a983a69fd0ec28a

 WebAPI/Controllers/»ªÔ¶datamapping/Gy_BarCodeBill_Set_TempController.cs

@@ -136,10 +136,10 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill_Set_Temp Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
                ds_his = oCN.RunProcReturn("Select * from Gy_BarCodeBill_Set_Temp_His Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp_His", ref DBUtility.ClsPub.sExeReturnInfo);
                if (ds.Tables[0].Rows.Count != 0 || ds_his.Tables[0].Rows.Count != 0) // Set条码表或者Set条码历史表中需要有对应数据
                {
                //ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill_Set_Temp Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
                //ds_his = oCN.RunProcReturn("Select * from Gy_BarCodeBill_Set_Temp_His Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp_His", ref DBUtility.ClsPub.sExeReturnInfo);
                //if (ds.Tables[0].Rows.Count != 0 || ds_his.Tables[0].Rows.Count != 0) // Set条码表或者Set条码历史表中需要有对应数据
                //{
                    DataSet ds_delcheck;
                    oCN.BeginTran();
                    //删除前控制=========================================
@@ -164,10 +164,9 @@
                    }
                    //=========================================================

                    // åŒæ—¶å¯¹Set表和Set历史表中的数据进行删除
                    // åŒæ—¶å¯¹Set临时表中的数据进行删除
                    ds = oCN.RunProcReturn("Delete from Gy_BarCodeBill_Set_Temp Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp", ref DBUtility.ClsPub.sExeReturnInfo);
                    ds_his = oCN.RunProcReturn("Delete from Gy_BarCodeBill_Set_Temp_His Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp_His", ref DBUtility.ClsPub.sExeReturnInfo);

                    //ds_his = oCN.RunProcReturn("Delete from Gy_BarCodeBill_Set_Temp_His Where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill_Set_Temp_His", ref DBUtility.ClsPub.sExeReturnInfo);


                    //删除后控制=========================================
@@ -199,15 +198,15 @@
                    objJsonResult.Message = "删除成功";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条码不存在";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //}
                //else
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "条码不存在";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
            }
            catch (Exception e)
            {