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

yusijie

2024-06-17 e469f1727d230550f8aec28644daa4a687a73857

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

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DotCheckBillController.cs

@@ -320,5 +320,85 @@
            }
        }
        #endregion

        #region ç‚¹æ£€é¡¹ç›®åˆ—表 æ ‘状图 ç‚¹å‡»åˆ†ç±»æŸ¥è¯¢
        public class TreeModel
        {
            public string id { get; set; }
            public string title { get; set; }
            public List<TreeModel> children = new List<TreeModel>();
        }
        [Route("Gy_DotCheckBill/TreeGetList")]
        [HttpGet]
        public object TreeGetList(string sWhere, string user)
        {
            try
            {

                ds = oCN.RunProcReturn("select b.HItemID,b.HNumber,b.HName from  Gy_DotCheck a left  join gy_DotCheckItemClass b on a.HDotCheckItemClassID=b.HItemID", "Gy_DotCheck");

                List<TreeModel> treeModels = new List<TreeModel>();
                TreeModel first = new TreeModel();
                first.id = "0";
                first.title = "点检项目分类设置";
                treeModels.Add(first);

                foreach (DataRow row in ds.Tables[0].Rows)
                {
                    var strLen = row["hitemid"].ToString().Split('.');
                    if (strLen.Length == 1)
                    {
                        TreeModel tree = new TreeModel();
                        tree.id = row["HItemID"].ToString();
                        tree.title = row["HName"].ToString();
                        treeModels[0].children.Add(tree);
                    }
                }
                digui(ds.Tables[0], treeModels[0].children, 2);


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// é€’归函数
        /// </summary>
        public void digui(DataTable dt, List<TreeModel> tree, int num)
        {
            for (int m = 0; m < tree.Count; m++)
            {
                tree[m].children = new List<TreeModel>();
                for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集
                {
                    var strLen = dt.Rows[i]["HNumber"].ToString().Split('.');
                    if (strLen.Length == num && dt.Rows[i]["HNumber"].ToString().Contains(tree[m].id + "."))
                    {
                        TreeModel tbjson = new TreeModel();
                        tbjson.id = dt.Rows[i]["HItemID"].ToString();
                        tbjson.title = dt.Rows[i]["HName"].ToString();
                        tree[m].children.Add(tbjson);
                    }
                }
                var strLens = tree[m].id.Split('.');
                for (int i = 0; i < tree[m].children.Count; i++)
                {
                    digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环，拿出子集的子集
                }
            }

        }
        #endregion
    }
}

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -240,6 +240,7 @@
                BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
                BillNew.HSourceInterID = mainList[0].HICMOInterID;
                BillNew.HSourceBillType = mainList[0].HSourceBillType;
                BillNew.HBadReasonHQty = mainList[0].HBadReasonHQty;
                oCN.BeginTran();
                //临时表
                oCN.RunProc("Insert Into Sc_ICMOBillQualityStatus_Tmp " +
@@ -247,13 +248,13 @@
                    ",HProcExchBillNo,HProcExchInterID,HProcExchEntryID,HProcID,HMaterID" +
                    ",HSourceID,HGroupID,HCheckManID,HBadReasonID,HBarCode" +
                    ",HMaker,HMakeDate,HBillType,HReportType,HSourceBillNo" +
                    ",HSourceInterID,HSourceBillType,HICMOEntryID,HSourceEntryID" +
                    ",HSourceInterID,HSourceBillType,HICMOEntryID,HSourceEntryID,HBadReasonHQty" +
                ") " +
                " values(" + BillNew.HInterID + ",'" + BillNew.HBillNo + "','" + BillNew.HDate + "','" + BillNew.HICMOBillNo + "'," + BillNew.HICMOInterID + 
                ",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
                "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
                ",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
                "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID +
                "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty +
                ") ");
                sReturn = "扫码成功！";
                oCN.Commit();

 WebAPI/DLL/ClsSc_MESStopWorkBill.cs

@@ -83,6 +83,7 @@
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HEmpID=" + omodel.HEmpID.ToString() +
                ",HStopReason='" + omodel.HStopReason + "'" +
                ",HStopType='" + omodel.HStopType + "'" +
                ",HReportType='" + omodel.HReportType + "'" +
                ",HBarCode='" + omodel.HBarCode + "'" +
                ",HAddr='" + omodel.HAddr + "'" +
@@ -176,7 +177,7 @@
                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStopBeginWorkTime,HStopEndWorkTime,HSourceID" +
                ",HGroupID,HDeptID,HEmpID,HStopReason,HReportType,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                ",HSourceInterID_Main,HSourceEntryID_Main,HSourceBillNo_Main,HSourceBillType_Main" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HStopType" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
@@ -184,7 +185,7 @@
                ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate(),'" + omodel.HStopEndWorkTime.ToShortDateString() + "'," + omodel.HSourceID.ToString() +
                "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HStopReason + "','" + omodel.HReportType + "','" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
                "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
                "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
                "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "','"+ omodel.HStopType + "'" +
                ") ");

                //再次验证 ä¿å­˜æ˜¯å¦ åˆç†

 WebAPI/Models/ClsSc_MESStopWorkBillMain.cs

@@ -37,5 +37,7 @@
        public int HSourceEntryID_Main;
        public string HSourceBillNo_Main;
        public string HSourceBillType_Main;

        public string HStopType; //斯莫尔 åœå·¥åŽŸå› æ–°å¢žå­—段
    }
}

 WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs

@@ -49,6 +49,7 @@
        public long HRelationEntryID { get; set; }//关联单子内码
        public string HRelationBillNo { get; set; }//关联单号
        public long HReportEntryID { get; set; }//汇报单子内码
        public long HBadReasonHQty { get; set; }//不良数量  æ–¯èŽ«å°”

    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>False|2024-06-13T02:45:10.1375417Z;False|2024-06-13T10:43:52.8804222+08:00;</History>
    <History>True|2024-06-17T05:22:25.8401219Z;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -18,28 +18,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>06/13/2024 10:54:10</publishTime>
      <publishTime>06/17/2024 13:22:14</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/13/2024 10:54:10</publishTime>
      <publishTime>06/17/2024 13:22:14</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/13/2024 10:54:09</publishTime>
      <publishTime>06/17/2024 13:22:13</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/13/2024 10:54:09</publishTime>
      <publishTime>06/17/2024 13:22:13</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>06/13/2024 10:54:06</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/13/2024 10:54:06</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -84,10 +84,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/13/2024 10:54:06</publishTime>
      <publishTime>06/17/2024 13:22:11</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/13/2024 10:54:06</publishTime>
      <publishTime>06/17/2024 13:22:11</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -120,25 +120,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>06/13/2024 10:54:04</publishTime>
      <publishTime>06/17/2024 13:22:09</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>06/13/2024 10:54:04</publishTime>
      <publishTime>06/17/2024 13:22:09</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>06/13/2024 10:54:05</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>06/13/2024 10:54:05</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/13/2024 10:54:05</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/13/2024 10:54:05</publishTime>
      <publishTime>06/17/2024 13:22:10</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,10 +246,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/13/2024 10:54:14</publishTime>
      <publishTime>06/17/2024 13:22:18</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/13/2024 10:54:14</publishTime>
      <publishTime>06/17/2024 13:22:18</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -444,7 +444,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/13/2024 10:54:20</publishTime>
      <publishTime>06/17/2024 13:22:24</publishTime>
    </File>
  </ItemGroup>
</Project>