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

chenhaozhe

2 天以前 25c2291ded30737b07fb7c93e5e231cc64733d2a

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -366,6 +366,22 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔") //系统参数  判断客户
                    {
                        if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                        {
                            oCN.RollBack();
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message =DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else
                    {
                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    oCN.RollBack();
@@ -375,6 +391,9 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                    }
                }
              
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
                //判断是否是 首道工序
                ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +
@@ -908,6 +927,7 @@
        [HttpGet]
        public object set_ShowBillJudge(string HBillNo)
        {
            string sReturn = "";
            try
            {
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_DelCtrl  '" + HBillNo + "'", "h_p_MES_StationInBill_DelCtrl");
@@ -938,6 +958,19 @@
            }
            catch (Exception e)
            {
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔") //系统参数  判断客户
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = e.ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
@@ -945,6 +978,16 @@
                return objJsonResult;
            }
        }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
        }
        #endregion

        #region 编辑页面根据id获取工序进站接收单信息