增加设备工艺参数的点检系统参数 -是否安灯 -NG是否发送工艺参数，通过审核进行触发系统参数，条码生产华舟增加自定义字段 总箱数，开工单大日志看为啥...

zrg

2026-04-08 f18eac47472b4d7182e3e88d48216df0ff6ab5e2

增加设备工艺参数的点检系统参数 -是否安灯  -NG是否发送工艺参数，通过审核进行触发系统参数，条码生产华舟增加自定义字段 总箱数，开工单大日志看为啥快捷开工是创建状态

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2450,8 +2450,18 @@
                    {
                        omodel.SB_EquipICMOTechParamBill_Check = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //审核后是否安灯
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_OAErrMsg")
                    {
                        omodel.SB_EquipICMOTechParamBill_OAErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //审核后是否发送NG工艺参数消息
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_ErrMsg")
                    {
                        omodel.SB_EquipICMOTechParamBill_ErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    

                    //=========工序委外发出单
                    //自动新增
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -799,6 +799,8 @@
        //设备工艺参数订单点检表
        public string SB_EquipICMOTechParamBill_MustBeginWorkCtl;              //必须开工状态才能保存单据
        public string SB_EquipICMOTechParamBill_Check;          //保存后是否自动审核
        public string SB_EquipICMOTechParamBill_OAErrMsg;          //审核后是否进行安灯
        public string SB_EquipICMOTechParamBill_ErrMsg;          //审核后是否进行发送NG工艺参数

        //工艺路线
        public string Gy_RoutingBill_AutoCheck;                     //保存后是否自动审核

 WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs

@@ -334,7 +334,24 @@
                            return objJsonResult;
                        }
                        else
                        {                            
                        {
                            //系统参数  è‡ªåŠ¨å®¡æ ¸
                            string sReturn = "";
                            if (oSystemParameter.ShowBill(ref sReturn) == true)
                            {
                                // æ‹¼æŽ¥ä¸¤ä¸ªå‚数：安灯,NG参数
                                string oa = oSystemParameter.omodel.SB_EquipICMOTechParamBill_OAErrMsg;//系统参数  æ˜¯å¦è¿›è¡Œå®‰ç¯
                                string ng = oSystemParameter.omodel.SB_EquipICMOTechParamBill_ErrMsg;//系统参数  æ˜¯å¦å‘送NG工艺参数信息 

                                // ç”¨é€—号拼接，前端按逗号拆分
                                objJsonResult.Verify = oa + "," + ng;                               
                            }
                            else
                            {
                                // å¤±è´¥æ—¶ç»™é»˜è®¤å€¼
                                objJsonResult.Verify = "N,N";
                            }

                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "单据号："+ oBill.omodel.HBillNo+ " å®¡æ ¸æˆåŠŸï¼";

 WebAPI/Controllers/SBGL/Sb_EquipReportController.cs

@@ -524,6 +524,65 @@
        }
        #endregion

        #region  è®¾å¤‡æ¯æ—¥è¿è¡ŒçŠ¶æ€åˆ†æžï¼ˆåšå•æƒ…况）
        /// <summary>
        /// è¿”回设备点检任务
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sb_EquipDotCheckTaskReport/Sb_EquipDailyRunStateList")]
        [HttpGet]
        public object Sb_EquipDailyRunStateList(string sWhere,string user)
        {
            try
            {

                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HBeginDate = dic["HBeginDate"].ToString();
                string HEndDate = dic["HEndDate"].ToString();

                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_Sb_EquipDailyRunStateReport  '" + HBeginDate + "','" + HEndDate + "'", "h_p_Sb_EquipDailyRunStateReport");

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    //添加列名
                    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;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -1734,6 +1734,9 @@
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                }

                LogService.Write("开工单自动生成工作联系单...1  " + oBill.omodel.HBillNo);

                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
                if (ds.Tables[0].Rows.Count == 0)
                {
@@ -1745,9 +1748,12 @@
                    return objJsonResult;
                }

                LogService.Write("开工单自动生成工作联系单...2 " + ds.Tables[0].Rows.Count);

                string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
                if (sAutoCheck == "Y")
                {
                    LogService.Write("开工单自动生成工作联系单...3 " + sAutoCheck);

                    if (!oBill.CheckBill(long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString()), ref DBUtility.ClsPub.sExeReturnInfo))
                    {
@@ -1763,9 +1769,10 @@
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    LogService.Write("开工单自动生成工作联系单...4 ");
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {                       
                        LogService.Write("自动生成工作联系单..."+ oBill.omodel.HInterID);
                        LogService.Write("开工单自动生成工作联系单..."+ oBill.omodel.HInterID);

                        //自动生成工作联系单
                        ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -1465,6 +1465,7 @@
                            barcode.JMHSupNumber = ordrlist[j].JMHSupNumber;
                            barcode.JMHSupName = ordrlist[j].JMHSupName;
                            barcode.HTH = ordrlist[j].HTH;
                            barcode.HZQty = ordrlist[j].HZQty;
                        }

                        barcode.HBarCode2 = TM;
@@ -1593,6 +1594,7 @@
            string JMHSupNumber = "";
            string JMHSupName = "";
            string HTH = "";
            double HZQty = 0;

            try
            {
@@ -1619,6 +1621,7 @@
                            JMHSupNumber = ClsPub.isStrNull(ListRows[i].JMHSupNumber);
                            JMHSupName = ClsPub.isStrNull(ListRows[i].JMHSupName);
                            HTH = ClsPub.isStrNull(ListRows[i].HTH);
                            HZQty = ClsPub.isDoule(ListRows[i].HZQty);                            
                        }

                        HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
@@ -1670,7 +1673,7 @@
                                   ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                                   ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                   ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                   ",HGiveAwayFlag,JMHSupID,JMHSupNumber,JMHSupName,HTH" +
                                   ",HGiveAwayFlag,JMHSupID,JMHSupNumber,JMHSupName,HTH,HZQty" +
                                   ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                                   ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HBarCodeStatus " +
                                   ") values ("
@@ -1680,7 +1683,7 @@
                                   + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                   + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
                                   + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                   + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)+",'"+ JMHSupID.ToString()+"','"+ JMHSupNumber+"','"+ JMHSupName+"','"+ HTH
                                   + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)+",'"+ JMHSupID.ToString()+"','"+ JMHSupNumber+"','"+ JMHSupName+"','"+ HTH + "','" + HZQty
                                   + "','" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
                                   + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','合格'" + ")");
                        }

 WebAPI/DLL/ClsSc_MESBeginWorkBill.cs

@@ -76,7 +76,7 @@
                }
                else
                {
                    LogService.Write("开工:2.6.2"+ Ds.Tables[0].Rows[0]["HBack"]);
                    LogService.Write("开工:2.6.2 "+ Ds.Tables[0].Rows[0]["HBack"]);
                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
                    {
                        LogService.Write("开工:2.6.3");

 WebAPI/Models/HBarCodeList.cs

@@ -85,11 +85,14 @@
        public int HInspectionCycle { get; set; }   //复检周期
        public string HReInspectionDate { get; set; }//复检日期
        public string HPOOrderBillMTO { get; set; }//采购跟踪号
                                                   //华舟 è‡ªå®šä¹‰


        //华舟 è‡ªå®šä¹‰
        public string JMHSupID { get; set; } // "金马供应商ID";
        public string JMHSupNumber { get; set; } // "金马供应商代码";
        public string JMHSupName { get; set; } // "金马供应商";
        public string HTH { get; set; } // "合同号";
        public double HZQty { get; set; } // "合同号";

    }
}

 WebAPI/Models/HSouceOrderList.cs

@@ -100,5 +100,6 @@
        public string JMHSupNumber { get; set; } // "金马供应商代码";
        public string JMHSupName { get; set; } // "金马供应商";
        public string HTH { get; set; } // "合同号";
        public double HZQty { get; set; } // "总箱数";
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user

@@ -339,10 +339,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/07/2026 15:38:07</publishTime>
      <publishTime>04/07/2026 17:46:01</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/07/2026 15:38:07</publishTime>
      <publishTime>04/07/2026 17:46:01</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>07/01/2025 16:53:56</publishTime>

 WebAPI/WebAPI.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />