1
wtt
2024-07-24 ed046e69610462580075f7a01ec7fa73fb571438
1
19个文件已修改
243 ■■■■ 已修改文件
DAL/生产管理/模具管理/ClsSc_MouldDotCheckPlanBill.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/模具管理/ClsSc_MouldMaintainPlanBill.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/设备管理/ClsSb_EquipDotCheckPlanBill.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/设备管理/ClsSb_EquipMaintainPlanBill.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldDotCheckPlanBillMain.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldMaintainPlanBillMain.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipDotCheckPlanBillMain.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipMaintainPlanBillMain.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/ProductInController.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_ManagementController.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutRequestBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/车间自检单/QC_WorkSelfCheckBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckPlanBill.cs
@@ -60,7 +60,9 @@
                ",HEndDate='" + omodel.HEndDate + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HUSEORGID=" + omodel.HUSEORGID +
                //",HCREATEORGID=" + omodel.HCREATEORGID +
                ",HDeptID=" + omodel.HDeptID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
@@ -142,12 +144,14 @@
                ",HMouldID,HBeginDate"+
                ",HEndDate,HCycleUnit,HCheckCycle" +
                ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
                ",HUSEORGID,HCREATEORGID,HDeptID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                ",'" + omodel.HEndDate + "','" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + 
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" + "," + omodel.HMouldDotCheckRuleID +
                "," + omodel.HUSEORGID + "," + omodel.HCREATEORGID + "," + omodel.HDeptID +
                ") ");
                //插入子表    //点检项目
                foreach (Model.ClsSc_MouldDotCheckPlanBillSub oSub in DetailColl)
DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBill.cs
@@ -68,6 +68,9 @@
                ",HMainSourceInterID=" + omodel.HMainSourceInterID +
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
                ",HMouldID=" + omodel.HMouldID +
                ",HUSEORGID=" + omodel.HUSEORGID +
                //",HCREATEORGID=" + omodel.HCREATEORGID +
                ",HDeptID=" + omodel.HDeptID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -147,12 +150,14 @@
                ",HYear,HPeriod,HRemark" +
                ",HCycleUnit,HCheckCycle,HBeginDate,HEndDate"+
                ",HInnerBillNo,HExplanation,HMouldMaintainRuleID,HMaintainLevID,HMainSourceInterID,HMainSourceBillNo,HMouldID" +
                ",HUSEORGID,HCREATEORGID,HDeptID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation  + "','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID +
                "," + omodel.HMainSourceInterID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HMouldID +
                "," + omodel.HMainSourceInterID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HMouldID + "," + omodel.HUSEORGID +
                "," + omodel.HCREATEORGID + "," + omodel.HDeptID +
                ") ");
                //插入子表配件信息
                foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckPlanBill.cs
@@ -55,6 +55,9 @@
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation+"'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
                ",HUSEORGID=" + omodel.HUSEORGID +
                //",HCREATEORGID=" + omodel.HCREATEORGID +
                ",HDeptID=" + omodel.HDeptID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -115,10 +118,11 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldDotCheckRuleID" +
                ") "+
                ",HUSEORGID,HCREATEORGID,HDeptID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldDotCheckRuleID + "'"+
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldDotCheckRuleID + "',"+ omodel.HUSEORGID + "," + omodel.HCREATEORGID + "," + omodel.HDeptID +
                ") ");
                //插入子表
                foreach (Model.ClsSb_EquipDotCheckPlanBillSub oSub in DetailColl)
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainPlanBill.cs
@@ -58,6 +58,9 @@
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                ",HMainSourceInterID=" + omodel.HMainSourceInterID +
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
                ",HUSEORGID=" + omodel.HUSEORGID +
                //",HCREATEORGID=" + omodel.HCREATEORGID +
                ",HDeptID=" + omodel.HDeptID +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -124,11 +127,13 @@
                oCn.RunProc("Insert Into Sb_EquipMaintainPlanBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldMaintainRuleID,HMaintainLevID,HMainSourceInterID,HMainSourceBillNo" +
                ") "+
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
                ",HMouldMaintainRuleID,HMaintainLevID,HMainSourceInterID,HMainSourceBillNo" +
                ",HUSEORGID,HCREATEORGID,HDeptID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID + "," + omodel.HMainSourceInterID + ",'" + omodel.HMainSourceBillNo + "'" +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID + "," + omodel.HMainSourceInterID + ",'" + omodel.HMainSourceBillNo + "'," + omodel.HUSEORGID + "," + omodel.HCREATEORGID + "," + omodel.HDeptID +
                ") ");
                if (DetailColl != null)
                {
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckPlanBillMain.cs
@@ -17,5 +17,8 @@
        public string HInnerBillNo;//    varchar(50)   --内部单据号
        public int HMouldDotCheckRuleID;//器具点检规程id
        public int HUSEORGID;
        public int HCREATEORGID;
        public int HDeptID;
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMaintainPlanBillMain.cs
@@ -19,5 +19,9 @@
        public Int64 HMaintainLevID; //保养级别(gy_HMaintainLev)
        public Int64 HMouldID; //器具内码
        public int HUSEORGID;
        public int HCREATEORGID;
        public int HDeptID;
    }
}
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckPlanBillMain.cs
@@ -14,7 +14,9 @@
        public string HExplanation;
        public string HInnerBillNo;
        public int HMouldDotCheckRuleID;//设备点检规程id
        public int HUSEORGID;
        public int HCREATEORGID;
        public int HDeptID;
    }
}
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainPlanBillMain.cs
@@ -17,5 +17,9 @@
        public string HMouldMaintainRuleNo;//保养规程单号
        public Int64 HMaintainLevID; //保养级别(gy_HMaintainLev)
        public int HUSEORGID;
        public int HCREATEORGID;
        public int HDeptID;
    }
}
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -61,12 +61,26 @@
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                if (ds.Tables[0].Rows.Count > 0 && ds != null)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查询到部门数据,请联系系统管理员进行核对";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
WebAPI/Controllers/LMESController.cs
@@ -510,7 +510,16 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    ds = oCN.RunProcReturn(@"select * from Sc_ICMOBillStatus_Tmp where HSourceInterID='"+ HInterID + "'   and  HSourceEntryID='"+ HEntryID + "'", "Sc_ICMOBillStatus_Tmp");
                    if (ds.Tables[0].Rows.Count != 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "该工序已派单,不允许重复排单!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.BeginTran();
                    oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSourceID + " where HInterID=" + HInterID + " and HEntryID=" + HEntryID);
WebAPI/Controllers/ProductInController.cs
@@ -264,8 +264,11 @@
            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            string sExpressNumber = "";
            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            Kf_MateOutBillController obill = new Kf_MateOutBillController();
            //重新同步生产领料单
            objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);
            WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {
WebAPI/Controllers/QC_ManagementController.cs
@@ -111,6 +111,53 @@
        #endregion
        #region æŸ¥è¯¢åˆ—表方法
        /// <summary>
        /// è¿”回检验方案单列表 ä»…包含主表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("QC_Management/MES_QC_CheckProjectList_Json_Main")]
        [HttpGet]
        public object MES_QC_CheckProjectList_Json_Main(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList_Main order by æ—¥æœŸ desc ", "h_v_Gy_QCCheckProjectList_Main");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_QCCheckProjectList_Main where 1=1";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList_Main");
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }
        /// <summary>
        /// è¿”回检验方案单列表
        /// </summary>
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -6907,6 +6907,45 @@
        }
        #endregion
        #region æŠ¥å·¥å°è·³è½¬å¼‚常反馈单 å¼¹çª—获取 è®¾å¤‡ç¼–码
        [Route("Sc_MESTransFerWorkBill/set_EquipFile")]
        [HttpGet]
        public object set_EquipFile(string HSourceName)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql = "select a.HEquipFileNumber è®¾å¤‡ç¼–码 ,a.HName è®¾å¤‡åç§° from Gy_EquipFileBillMain a left join Gy_Source b on a.HSourceID = b.HItemID where b.HName ='" + HSourceName   + "'";
                ds = oCN.RunProcReturn(sql, "Gy_ErrMsgBackType");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常,请与管理员联系!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å¼‚常反馈单 è·Ÿè¸ªæŸ¥è¯¢
        [Route("Sc_MESTransFerWorkBill/GetErrMsgBackResumeList")]
        [HttpGet]
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutRequestBillController.cs
@@ -11,7 +11,7 @@
using WebAPI.Models;
namespace WebAPI.Controllers.仓存管理.领料发货
namespace WebAPI.Controllers
{
    public class Kf_MateOutRequestBillController : ApiController
    {
WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs
@@ -34,7 +34,7 @@
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_QC_PatrolProcCheckOtherBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid ";
                string sql = sql1 + sWhere + " order by åˆ¶å•日期 desc ";
                ds = oCN.RunProcReturn(sql, "h_v_QC_PatrolProcCheckOtherBill");
                //添加列名
WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs
@@ -136,7 +136,7 @@
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_QC_ProcessCheckBillMainList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by åˆ¶å•日期 desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList");
                //添加列名
WebAPI/Controllers/Æ·ÖʹÜÀí/³µ¼ä×Լ쵥/QC_WorkSelfCheckBillController.cs
@@ -910,7 +910,7 @@
        }
        #endregion
        #region åº“å­˜/工序 æ£€éªŒå•根据源单类型获取信息-源单为工序流转卡
        #region è½¦é—´æ£€éªŒå•根据源单类型获取信息-源单为工序流转卡
        [Route("QC_WorkSelfCheckBill/get_ProcessExchangeBill")]
        [HttpGet]
        public object get_ProcessExchangeBill(string HInterID, string user)
WebAPI/Controllers/Æ·ÖʹÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillController.cs
@@ -34,7 +34,7 @@
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_QC_FirstPieceCheckBill where 1 = 1  ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                string sql = sql1 + sWhere + " order by åˆ¶å•日期 desc";
                ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBill");
                //添加列名
@@ -85,7 +85,7 @@
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from h_v_QC_FirstPieceCheckBillMainList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by åˆ¶å•日期 desc";
                string sql = sql1 + sWhere + "  ";
                ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBillMainList");
                //添加列名
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -3778,31 +3778,55 @@
        [HttpGet]
        public object get_SourceBarCode_MateOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HStockOrgID)
        {
            try
            //获取系统参数
            string sErrMsg = "";
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                if (WebSoBar == null)
                if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //系统参数是否为私有云模式,N为公有云模式,Y为私有云模式
                {
                    if(HSourceBillType == "1214")
                    {
                        //重新同步生产发料通知单
                        Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
                        objJsonResult = obill.GetKf_MateOutRequestBill_Sync_Json(HSourceBillNo, HSourceBillType);
                    }
                }
                try
                {
                    WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
                    if (WebSoBar == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功";
                        objJsonResult.data = WebSoBar;
                        return objJsonResult;
                    }
                }
                catch (Exception e)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "扫描源单条码失败!" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = WebSoBar;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描源单条码失败!" + e.ToString();
                objJsonResult.Message = "获取系统参数失败! " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }