yangle
2022-09-27 bc168ff5559475a7f32308a5111122d12238a8dd
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;
@@ -94,7 +112,7 @@
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn($"exec Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Delete {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
                objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());