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

yusijie

2023-02-08 bdc9a678092e8571da7754f1afd48a5055a2a0e5

 WebAPI/Controllers/MateOutController.cs

@@ -163,6 +163,79 @@

        }


        [Route("MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back")]
        [HttpGet]
        public object set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back(Int64 sInterID, string sBillNo, string HBillType, string sSourceBillNo, string sSourceType, string sRedBlue)
        {

            try
            {
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();

                WebS.WebService1 oWebs = new WebS.WebService1();
                string sWhere = " Where 单据号 like '%" + sSourceBillNo.Trim() + "'";
                //根据源单类型来调用不同的WEBS方法 new 
                if (sSourceType == "3720" && HBillType =="1204")
                {
                    ds = oWebs.GetSc_PPBomBillList(sWhere + "  ");
                }
                if (sSourceType == "3720" && HBillType == "1244")
                {
                    ds = oWebs.GetSc_PPBomBackBillList(sWhere + "  ");
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录,源单类型有错误！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！" + sSourceType;
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                   
                    if (oWebs.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, sSourceBillNo, sSourceType, "红字", ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "返回记录成功！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "写入临时表失败！" + DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception ex)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        public Model.ClsKf_ICStockBill_WMS get_SourceBarCode_MateOut(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HOWNERID, ref string sErrMsg)
        {
            //localhost/WEBS-WMS/get_SourceBarCode_MateOut?HInterID=131793&HBillNo=MATO00001643&HBillType=1204&HSourceBillNo=PPBOM202201164&HSourceBillType=3720&HMaker=Admin&HPTQty=0&HPlanMode=0&HFIFOWhID=0&HOWNERID=100439
@@ -792,8 +865,52 @@
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = new
                    {
                        list = ds.Tables[0],
                        list2 = ds.Tables[5]
                        list = ds.Tables[0]
                        //,
                        //list2 = ds.Tables[5]
                    };
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        //生产退料扫码刷新表体方法
        [Route("MateOutBackBill/DisBillEntryList")]
        [HttpGet]
        public object DisBillEntryList(long HBillID, string HBillType, string sWhere)
        {
            try
            {
                ds = oWebs.GetKf_PonderationBillMain_Temp(HBillID, HBillType, sWhere);
                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 = new
                    {
                        list = ds.Tables[0]
                        //,
                        //list2 = ds.Tables[5]
                    };
                    return objJsonResult;
                }