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

wtt

2024-07-11 6fbf013c660aa0d8b44a28be57ed2bf6704ab816

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

 DAL/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_QCCheckProjectMain.cs

@@ -40,9 +40,6 @@
                //更新主表
                oCn.RunProc("UpDate Gy_QCCheckProjectMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HBillStatus='" + omodel.HBillStatus + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                //",HBacker='"+omodel.HBacker+"'"+
@@ -92,6 +89,7 @@
                      ",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
                      ",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
                      ",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
                      ",HControlUpperLimit,HControlLowerLimit" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -105,6 +103,7 @@
                      "," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
                      "," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
                      + "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
                      ","+ oSub.HControlUpperLimit + ","+ oSub.HControlLowerLimit +
                      ") ");
                }

@@ -166,6 +165,7 @@
                      ",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
                      ",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
                      ",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
                      ",HControlUpperLimit,HControlLowerLimit" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -179,6 +179,7 @@
                      "," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB + 
                      "," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt 
                      + "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
                      ","+ oSub.HControlUpperLimit + "," +oSub.HControlLowerLimit +
                      ") ");
                }
                

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -82,6 +82,7 @@
                ",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HMouldNum='" + omodel.HMouldNum + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                ",HMainSourceBillSubType='" + omodel.HMainSourceBillSubType + "'" +
@@ -377,7 +378,8 @@
               ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HAuxQty2,HAuxUnit2,HSplitNo" +
               ",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
               ",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine" +
               ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HPlanOrderProcNo) " +
               ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HPlanOrderProcNo" +
               ",HMouldNum) " +
                " values('" + this.BillType + "','" + omodel.HBillSubType + "','" + (omodel.HMainSourceBillSubType==null?"": omodel.HMainSourceBillSubType) + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
                "," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -393,6 +395,7 @@
                ",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "'" +
                ",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "',"+ omodel.HEmpID + "," + omodel.HCusID + ",'"+ omodel.HColorRemark + "',"+ omodel.HSplitSumQty + ","+ omodel.HSplitColorQty + ",'"+ omodel.HMachineLine + "'" +
                ","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HRemark_New + "'," + omodel.HWeight_New + ",'" + omodel.HPlanOrderProcNo + "'" +
                ",'"+ omodel.HMouldNum + "'" +
                ")");
                sErr = sErr + "1;";
                //插入子表

 Model/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_QCCheckProjectSub.cs

@@ -41,6 +41,8 @@
        public Decimal HDownLimitQ;
        public Decimal HUpOffSetQ;
        public Decimal HDownOffSetQ;
        public Decimal HControlUpperLimit;
        public Decimal HControlLowerLimit;
        public Int64 HTargetValB;
        public Int64 HUpLimitB;
        public Int64 HDownLimitB;

 Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillMain.cs

@@ -112,5 +112,6 @@
        public string HMaterModel2;         //varchar(100)  äº§å“è§„æ ¼

        public string HPlanOrderProcNo; //订单跟踪号
        public string HMouldNum; //穴号
    }
}

 WebAPI/Controllers/QC_ManagementController.cs

@@ -957,6 +957,33 @@
        }
        #endregion

        #region æ£€éªŒæ–¹æ¡ˆæŸ¥è¯¢
        [Route("QC_Management/MES_QC_CheckProjectListProjectDetaiList")]
        [HttpGet]
        public object MES_QC_CheckProjectListProjectDetaiList(string sWhere,string user)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn(string.Format(@"select * from h_v_Gy_QCCheckProjectList_Edit where 1=1 " + sWhere), "h_v_Gy_QCCheckProjectList_Edit");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        #region æ£€éªŒæ–¹æ¡ˆç¼–辑时获取表体数据
        [Route("QC_Management/MES_QC_CheckProjectListProjectDetai")]
        [HttpGet]

 WebAPI/Controllers/Æ·ÖʹÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_TakeSampleCheckBillController.cs

@@ -1251,7 +1251,7 @@
                    return objJsonResult;
                }

                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                if (BillOld1.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1260,7 +1260,7 @@
                    return objJsonResult;
                }
                //判断是否可删除
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1269,7 +1269,7 @@
                    return objJsonResult;
                }
                //判断是否是创建状态进行删除
                if (int.Parse(BillOld.omodel.HBillStatus.ToString()) <= 1)
                if (int.Parse(BillOld1.omodel.HBillStatus.ToString()) <= 1)
                {
                    //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                    int sYear = 0;
@@ -1282,7 +1282,7 @@
                    }

                    //删除前控制=========================================      
                    string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                    string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_QC_BackSampleCheckBill_BeforeDelCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
@@ -1311,7 +1311,7 @@
                    oCN.RunProc("delete from QC_BackSampleCheckBillSub where HInterID= " + HInterID);

                    //删除后控制==================================================================================      
                    string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                    string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
                    ds = oCN.RunProcReturn(sql2, "h_p_QC_BackSampleCheckBill_AfterDelCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -486,8 +486,9 @@
                int limit = int.Parse(dic["limit"].ToString());
                int HQCCheckItemID = int.Parse(dic["HQCCheckItemID"].ToString());
                int HMaterID = int.Parse(dic["HMaterID"].ToString());
                string HMouldNum = dic["HMouldNum"].ToString();

                ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID, "h_p_QC_InspectionFormReport");
                ds = oCN.RunProcReturn("exec h_p_QC_InspectionFormReport '" + HBeginDate + "','" + HEndDate + "'," + limit + "," + HQCCheckItemID + "," + HMaterID + ",'" + HMouldNum + "'", "h_p_QC_InspectionFormReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)

 WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-07-10T05:44:55.6004881Z;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+08:00;</History>
    <History>True|2024-07-10T07:01:02.3675403Z;True|2024-07-10T13:44:55.6004881+08:00;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/10/2024 13:44:33</publishTime>
      <publishTime>07/10/2024 15:00:41</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/10/2024 13:44:33</publishTime>
      <publishTime>07/10/2024 15:00:41</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/10/2024 13:44:31</publishTime>
      <publishTime>07/10/2024 15:00:40</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/10/2024 13:44:31</publishTime>
      <publishTime>07/10/2024 15:00:40</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/10/2024 13:44:29</publishTime>
      <publishTime>07/10/2024 15:00:37</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/10/2024 13:44:29</publishTime>
      <publishTime>07/10/2024 15:00:37</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/10/2024 13:44:29</publishTime>
      <publishTime>07/10/2024 15:00:38</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/10/2024 13:44:29</publishTime>
      <publishTime>07/10/2024 15:00:38</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/10/2024 13:44:27</publishTime>
      <publishTime>07/10/2024 15:00:35</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/10/2024 13:44:27</publishTime>
      <publishTime>07/10/2024 15:00:35</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/10/2024 13:44:28</publishTime>
      <publishTime>07/10/2024 15:00:36</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/10/2024 13:44:28</publishTime>
      <publishTime>07/10/2024 15:00:36</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/10/2024 13:44:28</publishTime>
      <publishTime>07/10/2024 15:00:37</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/10/2024 13:44:28</publishTime>
      <publishTime>07/10/2024 15:00:37</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/10/2024 13:44:39</publishTime>
      <publishTime>07/10/2024 15:00:46</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/10/2024 13:44:39</publishTime>
      <publishTime>07/10/2024 15:00:46</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/10/2024 13:44:54</publishTime>
      <publishTime>07/10/2024 15:01:01</publishTime>
    </File>
  </ItemGroup>
</Project>