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

zzr99

2022-08-22 7d860d3718eaf73e26fefa91dbe4bea58ca30183

 WebAPI/Controllers/ProductInController.cs

@@ -168,6 +168,47 @@
            }
        }

        //缓存列表查询功能
        [Route("ProductInBillList/list1")]
        [HttpGet]
        public object list1(string BillType, string HBillNo, string HSourceBillNo)
        {
            try
            {
                if (HSourceBillNo == null)
                {
                    HSourceBillNo = "";
                }
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    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;
            }
        }


        /// <summary>
        /// 其他出库校验扫描单据号/直接调用webservice