页面合并

yangle

2022-03-31 e178fc47bd7c3ee89fdcf09e79d764f571e01146

页面合并

 WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs

@@ -614,6 +614,7 @@
        {
            public int HSouceInterID = 0;
            public int HSourceEntryID = 0;
            public int Type = 0;
            public string user { get; set; }
        }
        [Route("Sc_ComplementGoodBill/HlpBillList")]
@@ -622,48 +623,64 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //反序列化传递的值
                HlpBill com = JsonConvert.DeserializeObject<HlpBill>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_DownQuery 0,0,'',0,0,{com.HSouceInterID},{com.HSourceEntryID}"+
                    $",'{com.user}'", "h_p_JIT_CallGoodsPlatForm_DownQuery");

                if (ds != null)
                if (com.Type == 1)
                {
                    if (ds.Tables[0].Rows.Count != 0)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else if (ds.Tables[1].Rows.Count != 0)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess！";
                        objJsonResult.data = ds.Tables[1];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    //生产叫料平台  下查
                    ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_DownQuery 0,0,'',0,0,{com.HSouceInterID},{com.HSourceEntryID}" +
                       $",'{com.user}'", "h_p_JIT_CallGoodsPlatForm_DownQuery");
                }
                else if (com.Type == 2)
                {
                    //拣料配送 上查
                    ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_UpQuery '{com.HSouceInterID}',{com.HSourceEntryID}", "h_p_JIT_ComplementGoodsBillList_UpQuery");
                }
                else if (com.Type == 3)
                {
                    //拣料配送 下查
                    ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_DownQuery '{com.HSouceInterID}',{com.HSourceEntryID}", "h_p_JIT_ComplementGoodsBillList_DownQuery");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //type==1 存储过程里面查询了两次  所有需要判断两张表都有没有数据
                if (ds.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else if ((com.Type == 1 ? ds.Tables[1].Rows.Count : ds.Tables[0].Rows.Count) != 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[1];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data =null;
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
               

            }
            catch (Exception e)
            {
@@ -700,39 +717,21 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");

                List<CallGoodsBill> listCa = new List<CallGoodsBill>();
                //获取表格数据集合
                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
                int a = 0;
                if (listCa.Count > 0)
                ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList ", "h_v_IF_JIT_CallGoodsBillList ");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    for (int i = 0; i < listCa.Count; i++)
                    {
                        long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);
                        long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
                        long HWHID = int.Parse(listCa[i].HWHID.ToString());
                    ds.Clear();
                    long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
                    string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);

                        oCN.RunProc($"exec h_p_JIT_ComplementGoods_Insert {HInterID},'{HBillNo}',{HOrgID},'{user}',{HOutOrgID},{HWHID}");
                        a = 1;
                    }
                   ds= oCN.RunProcReturn($"exec h_p_JIT_ComplementGoods_Insert {HInterID},'{HBillNo}',{HOrgID},'{user}',0,0", "h_p_JIT_ComplementGoods_Insert");

                    if (a == 1)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "生成拣料单成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "生成拣料单失败";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                    objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
                    objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
@@ -778,39 +777,23 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");

                List<CallGoodsBill> listCa = new List<CallGoodsBill>();
                //获取表格数据集合
                listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
                int a = 0;
                if (listCa.Count > 0)
                ds = oCN.RunProcReturn("select * from JIT_CallGoodsBackBillMain ", "JIT_CallGoodsBackBillMain ");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    for (int i = 0; i < listCa.Count; i++)
                    {
                        long HInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
                        string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);
                        //long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
                        //long HWHID = int.Parse(listCa[i].HWHID.ToString());

                        oCN.RunProc($"exec h_p_JIT_GetCallGoodsBillCount_Back {HInterID},'{HBillNo}',{HOrgID},'{user}'");
                        a = 1;
                    }
                    long HInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
                    string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    //long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
                    //long HWHID = int.Parse(listCa[i].HWHID.ToString());

                    if (a == 1)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "生成退料单成功";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "生成退料单失败";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                   ds= oCN.RunProcReturn($"exec h_p_JIT_GetCallGoodsBillCount_Back {HInterID},'{HBillNo}',{HOrgID},'{user}'", "h_p_JIT_GetCallGoodsBillCount_Back");

                    objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                    objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
                    objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {