Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2023-12-29 d0d12fb5d0df58a0b9b3887f737551d17d5aeac8

 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")]
@@ -76,6 +77,7 @@
            }
        }
        #endregion

        #region 叫料退料单  删除
        [Route("Cj_CallGoodsBillBack/DelCallGoodsBill")]
        [HttpGet]
@@ -111,5 +113,40 @@
            }
        }
        #endregion

        #region 叫料单列表 (默认查询)
        [Route("Cj_CallGoodsBillBack/JIT_BackGoodsList")]
        [HttpGet]
        public object JIT_BackGoodsList(string HInterID, string user)
        {
            try
            {
                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = null;
                    objJsonResult.data = new DataTable();
                    return objJsonResult;
                }
               
                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}