parent: a651180e | 补丁 | 提交 | ignore whitespace
yangle
2022-09-27 bc168ff5559475a7f32308a5111122d12238a8dd 
快速过滤
5个文件已修改
72 ■■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_SendGoodsBillController.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs


@@ -29,6 +29,7 @@


            public int HOrgID;//组织


            public string HPZStatus;//品质确认


            public string HCKStatus;//仓库接收


            public string Arbitrarily;//任意参数


        }




        [Route("Cj_CallGoodsBillBack/CallGoodsBillBackMainList")]


@@ -57,8 +58,25 @@


                }




                CallGoodsBill ca = JsonConvert.DeserializeObject<CallGoodsBill>(sWhere);


                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +


                    $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'", "h_p_JIT_BackGoodsBillList_Query");


                oCN.RunProc($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +


                    $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'");




                if (ca.HPZStatus == "全部" && ca.HCKStatus == "全部")


                {


                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query1 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query1");


                }


                else if (ca.HPZStatus != "全部" && ca.HCKStatus == "全部")


                {


                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query2 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query2");


                }


                else if (ca.HPZStatus == "全部" && ca.HCKStatus != "全部")


                {


                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query3 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query3");


                }


                else if (ca.HPZStatus != "全部" && ca.HCKStatus != "全部")


                {


                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query4 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query4");


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;




 WebAPI/Controllers/CJGL/Cj_SendGoodsBillController.cs


@@ -29,6 +29,7 @@


            public string MaterialCode { get; set; }


            public string MaterialName { get; set; }


            public string MaterialModel { get; set; }


            public string Arbitrarily { get; set; }


            public int? HOrgID;


        }




@@ -60,8 +61,10 @@


                //反序列化传递的值


                JIT_SendGoodsBill com = JsonConvert.DeserializeObject<JIT_SendGoodsBill>(sWhere.ToString());




                ds = oCN.RunProcReturn($"exec h_p_JIT_DeptCheckGoodsBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.HDeptName}'," +


                   $"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}'", "h_p_JIT_DeptCheckGoodsBillList_Query");


               oCN.RunProc($"exec h_p_JIT_DeptCheckGoodsBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.HDeptName}'," +


                   $"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}'");




                ds = oCN.RunProcReturn("select * from ##h_p_JIT_DeptCheckGoodsBillList_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_DeptCheckGoodsBillList_Query");




                objJsonResult.code = "1";


                objJsonResult.count = 1;




 WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs


@@ -30,6 +30,7 @@


            public DateTime HEndDate { get; set; }//结束时间


            public string ProcMul { get; set; }//工段


            public string Hmaker { get; set; }//当前登录人


            public string Arbitrarily { get; set; }//任意参数


        }




        [Route("Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList")]


@@ -58,8 +59,10 @@


                //反序列化传递的值


                CallGoodsBackRequest com = JsonConvert.DeserializeObject<CallGoodsBackRequest>(sWhere.ToString());




                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +


                    $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");


                oCN.RunProc($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +


                        $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'");




                ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsRequestBillList_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_BackGoodsRequestBillList_Query");




                objJsonResult.code = "1";


                objJsonResult.count = 1;




 WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs


@@ -40,6 +40,7 @@


            public DateTime HEndDate { get; set; }//结束时间


            public int ps { get; set; }//仅显示未完全配送


            public string user { get; set; }//当前登录人


            public string Arbitrarily { get; set; }//任意参数


        }




        [Route("Sc_ComplementGoodBill/ComplementGoodBillList")]


@@ -68,11 +69,13 @@


                //反序列化传递的值


                ComplementGoodBill com = JsonConvert.DeserializeObject<ComplementGoodBill>(sWhere.ToString());




                    ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_Query '{com.HSeOrderBillNo}','{com.DepartmentName}','{com.MaterialNumber}','{com.MaterialName}'," +


                    $"'{com.MaterialModel}','{com.HICMOBillNo}','{com.CPNumber}','{com.CPName}','{com.CPModel}','{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}'," +


                    $"{com.ps},{com.Organization},'{com.user}' ", "h_p_JIT_CallGoodsPlatForm_Query");


                   oCN.RunProc($"exec h_p_JIT_CallGoodsPlatForm_Query '{com.HSeOrderBillNo}','{com.DepartmentName}','{com.MaterialNumber}','{com.MaterialName}'," +


                    $"'{com.MaterialModel}','{com.HICMOBillNo}','{com.CPNumber}','{com.CPName}','{com.CPModel}'," +


                    $"{com.ps},{com.Organization},'{com.user}' ");




                objJsonResult.code = "1";


                ds = oCN.RunProcReturn("select * from ##h_p_JIT_CallGoodsPlatForm_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_CallGoodsPlatForm_Query");




               objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


@@ -415,7 +418,7 @@


                {


                    if (listCa[i].退料数量 > 0)


                    {


                        if (listCa[i].退料数量 > listCa[i].已配送数量)


                        if (listCa[i].退料数量 > listCa[i].已配送数量&& listCa[i].已配送数量>0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


@@ -424,7 +427,7 @@


                            return objJsonResult;


                        }




                        ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +


                        ds = oCN.RunProcReturn("select isnull(sum(d.HQty),0) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +


                   $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");




                        if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].退料数量) > listCa[i].已叫料数量)


@@ -570,7 +573,7 @@


                {


                    if (listCa[i].退料数量 > 0)


                    {


                        if (listCa[i].退料数量 > listCa[i].已配送数量)


                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


@@ -667,7 +670,7 @@


                {


                    if (listCa[i].退料数量 > 0)


                    {


                        if (listCa[i].退料数量 > listCa[i].已配送数量)


                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;




 WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs


@@ -32,6 +32,7 @@


            public string HDeptName { get; set; }//部门


            public string HJLStatus { get; set; }//拣料状态


            public string user { get; set; }//制单人


            public string Arbitrarily { get; set; }//任意参数


        }




        [Route("Sc_ComplementGoods/ComplementGoodsList")]


@@ -60,9 +61,21 @@


                //反序列化传递的值


                ComplementGoods com = JsonConvert.DeserializeObject<ComplementGoods>(sWhere.ToString());




                oCN.RunProc($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +


                       $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'");




                ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +


                    $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");


                if (com.HJLStatus == "未拣料")


                {


                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query1 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query1");


                }


                else if (com.HJLStatus == "已拣料")


                {


                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query2 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query2");


                }


                else


                {


                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query3 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query3");


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;