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

zrg

2024-07-18 46ca4c95375f112a28113049517d27dc2e94384f

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

 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)

 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;
    }
}

 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/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/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/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_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;
            }