新增根据物料获取工艺路线工作中心下的产线方法，新增凯贝扫描客户条码解析方法

zrg

1 天以前 2ed7db74976db41fd445ff313e3f5042220fe2eb

新增根据物料获取工艺路线工作中心下的产线方法，新增凯贝扫描客户条码解析方法

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -4922,11 +4922,23 @@
        public object UploadFile_Gy_MouldFilen()
        {

            string path = "";
            string HBillNo = HttpContext.Current.Request.Params["HBillNo"];  //单据号
            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //备注
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HBillNo);
            string Ret = "";
            if (oSystemParameter.ShowBill(ref Ret))
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                {
                    path = "D:/网站发布/LAYUI/Files/Gy_MouldFilen/" + HBillNo;
                }
                else
                {
                    path = HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HBillNo);
                }
            }
            dynamic dyResult = UploadFile_Gy_MouldFilen(files, path, HBillNo, HRemark, HUserName);
            if (dyResult != null && dyResult.result == 1)
            {
@@ -4981,7 +4993,20 @@
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
                    string StrPath = "";

                    string Ret = "";
                    if (oSystemParameter.ShowBill(ref Ret))
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                        {
                            StrPath = "D:/网站发布/LAYUI/Files/Gy_MouldFilen/" + HBillNo + "/" + filename;
                        }
                        else
                        {
                            StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
                        }
                    }
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作，比如更新数据库
@@ -5041,7 +5066,19 @@
        [HttpGet]
        public object Gy_MouldFilen_Filelist(string HBillNo)
        {
            var url = fileip + "/Files/Gy_MouldFilen/" + HBillNo + "/";
            string Ret = "";
            var url = "";
            if (oSystemParameter.ShowBill(ref Ret))
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
                {
                    url = "D:/网站发布/LAYUI/Files/Gy_MouldFilen/" + HBillNo + "/";
                }
                else
                {
                    url = fileip + "/Files/Gy_MouldFilen/" + HBillNo + "/";
                }
            }

            try
            {
@@ -5075,9 +5112,7 @@
            try
            {

                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HSourceBillNo), HFileName);
                File.Delete(fileurl);      //删除指定文件
                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);             
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -15843,8 +15843,7 @@
            {

                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HSourceBillNo), HFileName);
                File.Delete(fileurl);      //删除指定文件
       
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
@@ -15860,6 +15859,8 @@
                return objJsonResult;
            }
        }


        #endregion



 WebAPI/Controllers/WebAPIController.cs

@@ -1424,6 +1424,48 @@
            }
        }

        /// <summary>
        /// èŽ·å–生产资源列表下拉框
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSouceList_Select")]
        [HttpGet]
        public object GetSouceList_Select(string HMaterID,Int64 HOrgID)
        {
            sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";            
            try
            {
                string sql = "EXEC h_p_Gy_SouceList_PC " + HMaterID + ",'" + sWhere + "'";
                ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceList_PC");

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }


        /// <summary>
        /// èŽ·å–职员列表

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -8118,11 +8118,7 @@
        #endregion

        #region ç”Ÿäº§ç»„托单模块 æ‰«æå®¢æˆ·ç®±ï¼ˆæ‰˜ï¼‰æ¡ç  -凯贝装箱单     20251103

        /// <summary>
        /// ç”Ÿäº§ç»„托单模块 æ‰«æç®±ï¼ˆæ‰˜ï¼‰æ¡ç 
        /// </summary>
        /// <returns></returns>
        
        [Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
        [HttpGet]
        public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
@@ -13362,7 +13358,6 @@

        #endregion


        #region æ£€éªŒå• æ‰«ææºå• æ ¹æ®å•æ®ç±»åž‹ æºå•ç±»åž‹ æºå•å· è§£æžå¹¶è¿”回检验项目
        [Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
        [HttpGet]
@@ -13428,5 +13423,52 @@
            }
        }
        #endregion

        #region å‡¯è´ è£…箱单扫描箱条码查询是否在客户条码档案，不在就解析保存客户条码档案表

        [Route("WEBSController/GetHBarCode_CusJX")]
        [HttpGet]
        public object GetHBarCode_CusJX(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
        {
            try
            {

                ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HSourceBillNo + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描箱、托条码发生错误！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "插入客户条码档案表失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
    }
}

 WebAPI/Properties/PublishProfiles/YsjPath.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|2025-12-18T09:15:13.3905366Z;True|2025-12-18T17:11:49.3437079+08:00;True|2025-12-18T16:17:48.6402963+08:00;True|2025-12-18T15:50:55.2709023+08:00;True|2025-12-18T15:44:33.9913783+08:00;True|2025-12-18T15:31:28.7580119+08:00;True|2025-12-18T15:31:15.7950222+08:00;True|2025-12-18T15:11:21.7608037+08:00;True|2025-12-18T12:51:44.7771285+08:00;True|2025-12-18T12:22:07.2748884+08:00;False|2025-12-18T12:19:38.3081567+08:00;True|2025-12-17T18:20:27.1265305+08:00;False|2025-12-17T18:18:59.5244466+08:00;False|2025-12-17T18:17:10.5036160+08:00;True|2025-12-17T17:58:02.5866472+08:00;True|2025-12-17T17:22:20.6401292+08:00;True|2025-12-17T15:54:31.5881737+08:00;True|2025-12-17T15:45:32.7951585+08:00;True|2025-12-17T14:42:33.6108738+08:00;True|2025-12-17T11:12:36.6951182+08:00;True|2025-12-17T10:30:06.3785953+08:00;True|2025-12-01T19:22:21.9416380+08:00;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
    <History>True|2025-12-22T06:16:49.4981363Z;True|2025-12-22T10:43:43.6377456+08:00;True|2025-12-22T10:31:45.9028615+08:00;True|2025-12-22T10:24:06.8991758+08:00;True|2025-12-22T10:11:51.3143511+08:00;True|2025-12-22T09:34:47.3603279+08:00;False|2025-12-22T09:32:22.5385633+08:00;True|2025-12-19T10:20:23.4428995+08:00;False|2025-12-19T10:14:53.8747410+08:00;True|2025-12-18T17:15:13.3905366+08:00;True|2025-12-18T17:11:49.3437079+08:00;True|2025-12-18T16:17:48.6402963+08:00;True|2025-12-18T15:50:55.2709023+08:00;True|2025-12-18T15:44:33.9913783+08:00;True|2025-12-18T15:31:28.7580119+08:00;True|2025-12-18T15:31:15.7950222+08:00;True|2025-12-18T15:11:21.7608037+08:00;True|2025-12-18T12:51:44.7771285+08:00;True|2025-12-18T12:22:07.2748884+08:00;False|2025-12-18T12:19:38.3081567+08:00;True|2025-12-17T18:20:27.1265305+08:00;False|2025-12-17T18:18:59.5244466+08:00;False|2025-12-17T18:17:10.5036160+08:00;True|2025-12-17T17:58:02.5866472+08:00;True|2025-12-17T17:22:20.6401292+08:00;True|2025-12-17T15:54:31.5881737+08:00;True|2025-12-17T15:45:32.7951585+08:00;True|2025-12-17T14:42:33.6108738+08:00;True|2025-12-17T11:12:36.6951182+08:00;True|2025-12-17T10:30:06.3785953+08:00;True|2025-12-01T19:22:21.9416380+08:00;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>12/17/2025 10:22:41</publishTime>
      <publishTime>12/19/2025 10:16:57</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>12/17/2025 10:22:41</publishTime>
      <publishTime>12/19/2025 10:16:57</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>12/17/2025 10:22:25</publishTime>
      <publishTime>12/19/2025 10:16:35</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>12/17/2025 10:22:25</publishTime>
      <publishTime>12/19/2025 10:16:35</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>12/17/2025 10:21:54</publishTime>
      <publishTime>12/19/2025 10:15:49</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>12/17/2025 10:21:54</publishTime>
      <publishTime>12/19/2025 10:15:49</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>12/17/2025 10:22:03</publishTime>
      <publishTime>12/19/2025 10:16:23</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>12/17/2025 10:22:03</publishTime>
      <publishTime>12/19/2025 10:16:23</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/23/2025 10:00:25</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>12/17/2025 10:21:49</publishTime>
      <publishTime>12/19/2025 10:15:29</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>12/17/2025 10:21:49</publishTime>
      <publishTime>12/19/2025 10:15:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>12/17/2025 10:21:52</publishTime>
      <publishTime>12/19/2025 10:15:36</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>12/17/2025 10:21:52</publishTime>
      <publishTime>12/19/2025 10:15:36</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>12/17/2025 10:21:50</publishTime>
      <publishTime>12/19/2025 10:15:38</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>12/17/2025 10:21:50</publishTime>
      <publishTime>12/19/2025 10:15:38</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>12/17/2025 10:21:40</publishTime>
      <publishTime>12/18/2025 17:37:23</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>12/17/2025 10:21:40</publishTime>
      <publishTime>12/18/2025 17:37:26</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>12/17/2025 10:21:48</publishTime>
      <publishTime>12/18/2025 17:36:51</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>12/17/2025 10:21:48</publishTime>
      <publishTime>12/18/2025 17:36:54</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>12/18/2025 17:14:16</publishTime>
      <publishTime>12/22/2025 14:13:32</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>12/18/2025 17:14:16</publishTime>
      <publishTime>12/22/2025 14:13:32</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -328,6 +328,9 @@
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>12/16/2025 16:29:36</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/23/2025 10:00:25</publishTime>
@@ -498,7 +501,7 @@
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>12/17/2025 10:30:05</publishTime>
      <publishTime>12/19/2025 10:20:22</publishTime>
    </File>
  </ItemGroup>
</Project>