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

王 垚

2021-10-20 f5bb218bb36f37445d06451f51795d131f85badb

 WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs

@@ -17,20 +17,23 @@

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        public WebS.WebService1 oWebs = new WebS.WebService1();
        //public WebS.ClsGy_BarCodeBill_WMS_Model_View ds = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
        public Model.ClsKF_PonderationBillMain_Temp omodel = new Model.ClsKF_PonderationBillMain_Temp();

        public DAL.ClsSc_MouldDotCheckBill BillNew = new DAL.ClsSc_MouldDotCheckBill();   //对应单据类
        public DAL.ClsSc_MouldDotCheckBill BillOld = new DAL.ClsSc_MouldDotCheckBill();   //对应单据类

        public DAL.ClsSc_MouldMaintainBill BillNew1 = new DAL.ClsSc_MouldMaintainBill();   //对应单据类
        public DAL.ClsSc_MouldMaintainBill BillOld1 = new DAL.ClsSc_MouldMaintainBill();   //对应单据类
        DataSet ds;

        #region  模治具点检记录单

        #region 根据模治具条码查找模具档案信息
        [Route("Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown")]
        [HttpGet]
        public object txtHBarCode_KeyDown(string HBarCode)
        public object txtHBarCode_KeyDown(string HBarCode,long HInterID,long HWHID,long HSPID)
        {
            try
            {
@@ -44,8 +47,9 @@
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
                //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                if (ds == null )
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -53,11 +57,37 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                else
                {
                    omodel.HInterID = HInterID;
                    omodel.HBillType = "3796";
                    omodel.HMaker = DBUtility.ClsPub.CurUserName;
                    omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
                    omodel.HQty = 0;
                    omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
                    omodel.HWhID = HWHID;
                    omodel.HStockPlaceID = HSPID;
                    omodel.HSourceBillNo = "1";
                    omodel.HSourceBillType = "1";
                    omodel.HSourceEntryID = 0;
                    omodel.HSourceInterID = 0;
                    if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "扫码成功！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "存入缓存表失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception e)
            {
@@ -68,7 +98,72 @@
                return objJsonResult;
            }
        }

        public bool set_SavePonderationBillMain_Temp(Model.ClsKF_PonderationBillMain_Temp oMain, ref string sErrMsg)
        {
            DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
            DAL.ClsGy_BarCodeBill_View oBar = new DAL.ClsGy_BarCodeBill_View();
            dal.oModel = oMain;
            if (!oBar.GetInfoByNumber_View(oMain.HBarCode))
            {
                sErrMsg = "无效条码";
                return false;
            }
            else
            {
                if (oBar.omodel_View.HBarCodeType == "托盘条码")
                {
                    if (!dal.IsBarCode_Pack(oMain.HBarCode, oMain.HInterID, oMain.HBillType))
                    {
                        sErrMsg = "存在相同条码，请勿重复扫描！";
                        return false;
                    }
                    if (dal.AddNew_More(ref sErrMsg))
                    {
                        //sErrMsg = "保存成功！";
                        return true;
                    }
                    else
                    {
                        //sErrMsg = "保存失败！";
                        return false;
                    }
                }
                else
                {
                    if (oBar.omodel_View.HBarCodeType == "唯一条码")
                    {
                        if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType))
                        {
                            sErrMsg = "存在相同条码，请勿重复扫描！";
                            return false;
                        }
                        //判断条码临时表中是否存在(调拨单同一条码相同调入调出仓库仓位只允许扫描一次，销售出库同一条码同一仓库仓位只允许扫描一次)  丸井
                        //if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType,oMain.HWhID,oMain.HStockPlaceID,oMain.HSCWHID,oMain.HOutStockPlaceID,oMain.))
                        //{
                        //    sErrMsg = "存在相同条码，请勿重复扫描！";
                        //    return false;
                        //}
                    }
                    if (dal.AddNew(ref sErrMsg))
                    {
                        //sErrMsg = "保存成功！";
                        return true;
                    }
                    else
                    {
                        //sErrMsg = "保存失败！";
                        return false;
                    }
                }
            }
            //dal.oCn.CnClose();
            //dal.oCn.CnDispose();
            //oBar.
        }
        #endregion



        #region 模治具点检记录提交

@@ -214,44 +309,44 @@
        #region 根据模治具条码查找模具档案信息
        [Route("Mj_PDA_MouldMaintainBill/txtHBarCodeMaintain_KeyDown")]
        [HttpGet]
        public object txtHBarCodeMaintain_KeyDown(string HBarCode)
        {
            try
            {
                if (HBarCode == null || HBarCode.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条形码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到模具信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                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 = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //public object txtHBarCodeMaintain_KeyDown(string HBarCode)
        //{
        //    try
        //    {
        //        if (HBarCode == null || HBarCode.Equals(""))
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "条形码不能为空！";
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        //得到信息
        //        ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
        //        //写入信息
        //        if (ds == null || ds.Tables[0].Rows.Count == 0)
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "未查询到模具信息！";
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        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 = "Exception！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        #endregion

        #region 模治具保养记录提交