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

ch

2022-10-20 e79ef1f195754b2afdc8e1e149d64774c7757ad9

 WebAPI/Controllers/MateOutController.cs

@@ -807,6 +807,44 @@
        }


        //选中表体  根据单据主ID返回收料通知单一些信息
        [Route("QCStockInCheckBill/DisBillEntryList_Webs_New_Json1")]
        [HttpGet]
        public object DisBillEntryList_Webs_New_Json1(long HInterID,long HEntryID)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBillList where HInterID = " + HInterID + " and HEntryID = " + HEntryID + "", "h_v_QCStockInCheckBillList");
                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;
            }
        }


        //刷新表体  返回条码库存信息
        [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
        [HttpGet]