1

zrg

2026-01-26 f53896f992c025929477f74726bfbf11ea477785

1

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/BLL.dll

Binary files differ

 BLL/bin/x86/Release/BLL.pdb

Binary files differ

 BLL/bin/x86/Release/DAL.dll

Binary files differ

 BLL/bin/x86/Release/DAL.pdb

Binary files differ

 BLL/bin/x86/Release/DBUtility.dll

Binary files differ

 BLL/bin/x86/Release/DBUtility.pdb

Binary files differ

 BLL/bin/x86/Release/Model.dll

Binary files differ

 BLL/bin/x86/Release/Model.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Class.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Control.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/x86/Release/SQLHelper.dll

Binary files differ

 BLL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/TopSdk.dll

Binary files differ

 BLL/bin/x86/Release/TopSdk.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/x86/Release/DAL.dll

Binary files differ

 DAL/bin/x86/Release/DAL.pdb

Binary files differ

 DAL/bin/x86/Release/DBUtility.dll

Binary files differ

 DAL/bin/x86/Release/DBUtility.pdb

Binary files differ

 DAL/bin/x86/Release/Model.dll

Binary files differ

 DAL/bin/x86/Release/Model.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Class.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Control.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/x86/Release/SQLHelper.dll

Binary files differ

 DAL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DAL/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckOtherBill.cs

@@ -169,14 +169,14 @@
                ",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
                ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
                ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
                ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HCheckQty" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
                ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
                "," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
                "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
                "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'," + omodel.HCheckQty + 
                ") ");
                //插入子表
                foreach (Model.ClsQC_PatrolProcCheckOtherBillSub oSub in DetailColl)

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/bin/x86/Release/DBUtility.dll

Binary files differ

 Model/bin/x86/Release/DBUtility.pdb

Binary files differ

 Model/bin/x86/Release/Model.dll

Binary files differ

 Model/bin/x86/Release/Model.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Class.dll

Binary files differ

 Model/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Control.dll

Binary files differ

 Model/bin/x86/Release/Pub_Control.pdb

Binary files differ

 Model/bin/x86/Release/SQLHelper.dll

Binary files differ

 Model/bin/x86/Release/SQLHelper.pdb

Binary files differ

 Model/obj/x86/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
b79b3c0c4971d4b381c2412fc062953b25704479
d0c44618c2b8dbcb19468e7481c83bfc987c140a

 Model/obj/x86/Release/Model.dll

Binary files differ

 Model/obj/x86/Release/Model.pdb

Binary files differ

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1853,6 +1853,7 @@
                    {
                        omodel.Kf_EntrustOutBackBillCheck_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    

                    //===========生产组托单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_SourceBillTypeCtl")

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -1,10 +1,11 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -80,8 +80,8 @@

        #endregion

        #region ä¸‹æŽ¨æ ¹æ®è®¾å¤‡id查询回显
        [Route("Gy_EquipFileMain/getSb_EquipList")]
        #region ä¸‹æŽ¨æ ¹æ®è®¾å¤‡id查Gy_EquipFileMain/GetResumeList询回显
        [Route("Gy_EquipFileMain/getSb_EquipList")]
        [HttpGet]
        public object getSb_EquipBeginBillList(int HInterID, string user)
        {

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs

@@ -514,6 +514,50 @@
        }
        #endregion

        #region æ ¹æ®è®¾å¤‡ID查找设备档案信息PDA  æŸ¥è¯¢æ¡ç æ¡£æ¡ˆåˆ—表
        [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID")]
        [HttpGet]
        public object txtHBarCode_KeyDown_ListByHEquipID(string HEquipID)
        {
            try
            {
                if (HEquipID == null || HEquipID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "设备内码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList  where hmainid= " + HEquipID , "h_v_Gy_EquipFileMainList");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到设备信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region æ ¹æ®è®¾å¤‡æ¡ç æŸ¥æ‰¾è®¾å¤‡æ¡£æ¡ˆä¿¡æ¯PDA  æŸ¥è¯¢æ¡ç æ¡£æ¡ˆåˆ—表
        [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List")]
        [HttpGet]

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -8232,14 +8232,29 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql = "select * from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
                string sql = $@"select HSendMan å›žå¤äºº, HDescription å›žå¤å†…容, HDate å›žå¤æ—¶é—´,
                                case HSendStatus 
                                when 1 then '普通'
                                when 10 then '验证通过'
                                when 9 then '结案'
                                end as ç±»åž‹
                                ,* from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
                ds = oCN.RunProcReturn(sql, "OA_WorkLinkBillSub");

                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 e)

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -1633,7 +1633,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    LogService.Write("源单类型: " + oItem.HMainSourceBillType);
                    //oItem.HMaker = "";
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3910";

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1709,8 +1709,8 @@
                }
                LogService.Write("WMS_CampanyName: ", oSystemParameter.omodel.WMS_CampanyName);

                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                {
                    string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                             join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                             join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1727,7 +1727,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                //}
                }
                


@@ -1738,10 +1738,10 @@
                model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织
                model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门
                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                {
                    model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                //}
                }
                model.Add("FISSYNCED", "false");//  æ˜¯å¦å·²åŒæ­¥
                model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));//  æŠ¥æ£€æ—¥æœŸ
                model.Add("FBillNo", HBillNo);
@@ -1782,12 +1782,12 @@
                FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //基本单位数量
                FentityModel2.Add("FUsePolicy", HUseResult.ToString());   //使用决策
                FentityModel2.Add("FIsCheck", false);   //是否抽检
                //FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                FentityModel2.Add("FIsDefectProcess", false);  //不良处理
                // é”¦éš†å¯ç”¨ä¸è‰¯å¤„理
                //if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                //{
                if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "锦隆"))
                {
                    FentityModel2.Add("FIsDefectProcess", true);  //不良处理
                //}
                }
                FentityModel2.Add("FCanSale", false);   //可销售
                FentityModel2.Add("FIsMRBReview", false);   //MRP评审
                FentityModel2.Add("FIsReturn", true);   //判退

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs

@@ -244,6 +244,7 @@
                BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
                BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
                BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
                BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
                List<Model.ClsQC_PatrolProcCheckOtherBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub>>(msg3);
                BillNew.DetailColl = new List<Model.ClsQC_PatrolProcCheckOtherBillSub>();
                for (int i = 0; i < subList.ToArray().Length; i++)
@@ -1326,6 +1327,63 @@
        }
        #endregion

        #region å·¡æ£€å•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为取样单
        [Route("QC_PatrolProcCheckBill/get_TakeSampleCheckBill")]
        [HttpGet]
        public object get_TakeSampleCheckBill(string HInterID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'工序','" + HInterID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'物料','" + HInterID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'工艺路线','" + HInterID + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProc_GetTakeSampleCheckBillList");

                //添加列名
                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 e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region  PDA巡检记录单 æŸ¥è¯¢åˆ—表
        [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA")]
        [HttpGet]

 WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs

@@ -242,6 +242,62 @@
        }
        #endregion

        #region å·¥åºæ£€éªŒå•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为取样单
        [Route("QC_ProcessCheckBill/get_TakeSampleCheckBill")]
        [HttpGet]
        public object get_TakeSampleCheckBill(string HInterID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'工序','" + HInterID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'物料','" + HInterID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'工艺路线','" + HInterID + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_Process_GetTakeSampleCheckBillList");

                //添加列名
                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 e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥åºæ£€éªŒå• å®¡æ ¸ åå®¡æ ¸ å…³é—­ åå…³é—­ ä½œåºŸ åä½œåºŸ
        /// <summary>
        /// å·¥åºæ£€éªŒå• å®¡æ ¸ã€åå®¡æ ¸

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

@@ -13834,15 +13834,22 @@
                if(Mode == 1)
                {
                    //扫码模式需要解析条码获取HInterID和HEntryID
                    LogService.Write($@"
                    exec h_p_CheckBillBarCode_AnalysisBarcode 
                        @HBillType={HBillType},
                        @HSourceBillType={HSourceBillType},
                        @HBarCode='{HBarCode}',
                        @user = '{user}'
                    ");
                    ds = oCn.RunProcReturn($@"
                    exec h_p_CheckBillBarCode_AnalysisBarcode 
                        @HBillType={HBillType},
                        @HSourceBillType={HSourceBillType},
                        @HBarCode={HBarCode},
                        @HBarCode='{HBarCode}',
                        @user = '{user}'
                    ", "h_p_CheckBillBarCode_AnalysisBarcode");

                    if (ds.Tables[0].Rows.Count == 0)
                    if (ds is null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -13982,5 +13989,45 @@
            }
        }
        #endregion

        #region [取样单] èŽ·å–未下推成检验单的取样单列表
        [Route("WEBSController/AwaitCheckSampleBillList")]
        [HttpGet]
        public Object AwaitCheckSampleBillList(string user)
        {
            List<object> columnNameList = new List<object>();
            try
            {
                ds = oCn.RunProcReturn($@"
                    exec h_p_AwaitCheckSampleBillList @user={user}
                ", "h_p_CheckBillBarCode_CheckItem");

                //添加列名
                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 = "success！";
                objJsonResult.data = ds.Tables;
                objJsonResult.list = columnNameList;

                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描单据条码失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs

@@ -258,7 +258,7 @@
                //

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + $"',{omodel.HMainSourceBillType}", "h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";

 WebAPI/Properties/PublishProfiles/FolderProfile4.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|2026-01-20T02:28:19.5250951Z;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+08:00;</History>
    <History>True|2026-01-26T01:37:16.8828589Z;False|2026-01-26T09:36:35.9597492+08:00;True|2026-01-25T15:20:11.0096169+08:00;True|2026-01-25T14:52:25.7167654+08:00;True|2026-01-25T14:28:16.6779637+08:00;False|2026-01-25T14:27:32.6753765+08:00;True|2026-01-23T16:17:17.9227805+08:00;True|2026-01-23T14:37:25.7929932+08:00;True|2026-01-23T14:32:25.7611106+08:00;False|2026-01-23T14:31:28.4811198+08:00;True|2026-01-22T09:55:07.0908298+08:00;True|2026-01-22T09:38:49.9102490+08:00;False|2026-01-22T09:37:53.0384929+08:00;True|2026-01-21T16:50:27.5625267+08:00;True|2026-01-21T10:50:18.7634322+08:00;True|2026-01-21T10:47:56.7913811+08:00;True|2026-01-21T10:41:46.5883817+08:00;True|2026-01-21T09:29:22.5824101+08:00;False|2026-01-21T09:28:13.4362586+08:00;True|2026-01-20T14:26:36.7806712+08:00;True|2026-01-20T13:13:01.3064754+08:00;False|2026-01-20T13:12:08.1800841+08:00;True|2026-01-20T10:28:19.5250951+08:00;True|2026-01-20T10:27:41.5947282+08:00;True|2026-01-20T10:23:10.6474490+08:00;True|2026-01-20T10:07:24.8412652+08:00;True|2026-01-20T09:53:19.8583529+08:00;True|2026-01-20T08:21:20.5302494+08:00;False|2026-01-20T08:20:24.6093320+08:00;True|2026-01-19T15:58:34.1439056+08:00;True|2026-01-19T15:56:47.6488483+08:00;True|2026-01-19T15:12:36.9286562+08:00;True|2026-01-19T14:55:17.2807312+08:00;True|2026-01-19T14:47:03.8892836+08:00;True|2026-01-19T14:36:15.0507410+08:00;True|2026-01-19T14:26:05.5060287+08:00;True|2026-01-19T13:50:54.8654304+08:00;True|2026-01-19T13:37:47.2294303+08:00;True|2026-01-19T13:20:13.3781676+08:00;True|2026-01-19T13:07:18.8111360+08:00;True|2026-01-19T13:01:15.1432453+08:00;True|2026-01-19T11:54:26.6582081+08:00;True|2026-01-19T11:23:28.6100843+08:00;True|2026-01-19T08:41:23.8724527+08:00;True|2026-01-19T08:34:06.3247836+08:00;True|2026-01-19T07:48:11.5052413+08:00;False|2026-01-19T07:47:21.4586297+08:00;True|2026-01-18T14:27:24.9640228+08:00;True|2026-01-18T13:21:44.9690334+08:00;False|2026-01-18T13:20:08.6314025+08:00;False|2026-01-16T16:53:24.3290896+08:00;True|2026-01-16T09:03:14.4122067+08:00;True|2026-01-16T08:44:23.0342932+08:00;False|2026-01-16T08:43:34.3488415+08:00;True|2026-01-15T16:27:10.8480719+08:00;False|2026-01-15T16:26:06.6002625+08:00;True|2026-01-15T13:04:43.0602637+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>01/20/2026 10:27:11</publishTime>
      <publishTime>01/26/2026 09:36:51</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>01/20/2026 10:27:11</publishTime>
      <publishTime>01/26/2026 09:36:51</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/20/2026 10:27:09</publishTime>
      <publishTime>01/26/2026 09:36:49</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/20/2026 10:27:09</publishTime>
      <publishTime>01/26/2026 09:36:49</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/20/2026 10:27:02</publishTime>
      <publishTime>01/26/2026 09:36:44</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>01/20/2026 10:27:02</publishTime>
      <publishTime>01/26/2026 09:36:44</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -123,10 +123,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/20/2026 10:27:04</publishTime>
      <publishTime>01/26/2026 09:36:45</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/20/2026 10:27:04</publishTime>
      <publishTime>01/26/2026 09:36:45</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -159,34 +159,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/20/2026 10:26:59</publishTime>
      <publishTime>01/26/2026 09:36:42</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>01/20/2026 10:26:59</publishTime>
      <publishTime>01/26/2026 09:36:42</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/20/2026 10:27:00</publishTime>
      <publishTime>01/26/2026 09:36:43</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>01/20/2026 10:27:00</publishTime>
      <publishTime>01/26/2026 09:36:43</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/20/2026 10:27:01</publishTime>
      <publishTime>01/26/2026 09:36:43</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>01/20/2026 10:27:01</publishTime>
      <publishTime>01/26/2026 09:36:43</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/20/2026 10:26:02</publishTime>
      <publishTime>01/26/2026 09:35:13</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/20/2026 10:26:02</publishTime>
      <publishTime>01/26/2026 09:35:13</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -297,22 +297,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/20/2026 10:26:09</publishTime>
      <publishTime>01/26/2026 09:35:19</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/20/2026 10:26:09</publishTime>
      <publishTime>01/26/2026 09:35:19</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>01/20/2026 10:28:10</publishTime>
      <publishTime>01/26/2026 09:37:00</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>01/20/2026 10:28:10</publishTime>
      <publishTime>01/26/2026 09:37:00</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>01/20/2026 10:28:17</publishTime>
      <publishTime>01/26/2026 09:37:14</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 WebAPI/Service/GeTuiService.cs

@@ -46,7 +46,7 @@
                {
                    string title = ds.Tables[0].Rows[0]["主题"].ToString();
                    string content = ds.Tables[0].Rows[0]["内容"].ToString();
                    template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillList", "0");
                    template = GetNotificationTemplate(title, content, "/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery", "0"); // è·³è½¬åˆ°å·¥ä½œè”系单查询页面

                    // å¹¿æ’­
                    if(ds.Tables[0].Rows[0]["发送类型"].ToString() == "公共")
@@ -156,8 +156,8 @@
            template.IsClearable = true;
            var customData = new Dictionary<string, string>
            {
                {"pagePath", pagePath}, // ç¤ºä¾‹ï¼š"/pages/detail/detail"
                {"itemId", HItemID}      // ç¤ºä¾‹ï¼š"123456"
                {"pagePath", pagePath},
                {"itemId", HItemID}     
            };
            template.TransmissionContent = JsonConvert.SerializeObject(customData); // åºåˆ—化为 JSON å­—符串
            template.TransmissionType = 1; // 1=点击通知后触发客户端回调（透传内容给客户端）

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt

@@ -5,6 +5,7 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ