1

wtt

2024-06-27 ac178542f0b9f1171d2e5d5ae907305c7c5abd33

1

 DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs

@@ -71,6 +71,7 @@
                ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
                ",HEquipMaintainRuleInterID=" + omodel.HEquipMaintainRuleInterID.ToString()+
                ",HMaintainLevID=" + omodel.HMaintainLevID +
                ",HLastResult='" + omodel.HLastResult + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -103,13 +104,14 @@
                          ",HMaintainPart,HClaim" +
                          ",HManagerID" +
                          ",HCloseMan,HCloseType,HRemark" +
                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                          ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
                          ") values("
                          + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + 
                          ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
                          "," + Item.HManagerID.ToString() +
                          ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
                          "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + 
                          ",'" + Item.HMaintainResult + "'" +
                          ") ");
                }

@@ -174,11 +176,11 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
                ",HDeptID,HMaintainLevID" + 
                ",HDeptID,HMaintainLevID,HLastResult" + 
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID +
                ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID + ",'" + omodel.HLastResult + "'" +
                ") ");
                //插入配件子表
                foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)

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

@@ -122,6 +122,7 @@
                ",HWorkerID=" + omodel.HWorkerID.ToString() +
                ",HWorkerBarCode='" + omodel.HWorkerBarCode + "'" +
                ",HGroupID=" + omodel.HGroupID.ToString() +
                ",HProcNo=" + omodel.HProcNo.ToString() +
                ",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
                ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
@@ -196,14 +197,14 @@
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
                ",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
                ",HGroupID,HStockOrgID" +
                ",HGroupID,HProcNo,HStockOrgID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
                "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID.ToString() + ",'" + omodel.HICMOBillNo + "'" +
                "," + omodel.HSourceID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HMaterID.ToString() + ",'" + omodel.HSourceBarCode + "'," + omodel.HEquipID.ToString() + "," + omodel.HWorkerID.ToString() + ",'" + omodel.HWorkerBarCode + "'" +
                "," + omodel.HGroupID.ToString() +"," + omodel.HSTOCKORGID.ToString() +
                "," + omodel.HGroupID.ToString() + "," + omodel.HProcNo.ToString() + "," + omodel.HSTOCKORGID.ToString() +
                ") ");
                //插入子表
                foreach (Model.ClsSc_MaterToSourceBillSub oSub in DetailColl)

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs

@@ -19,5 +19,6 @@
        public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码

        public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
        public string HLastResult;// æœ€ç»ˆç»“论（OK，NG） 
    }
}

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

@@ -20,7 +20,7 @@
        public Int64 HWorkerID;//             int             --操作工ID
        public string HWorkerBarCode;//        varchar(50)     --操作工条码
        public Int64 HGroupID;//              int                --生产班组ID

        public Int64 HProcNo;//              int                --流水号（工序号）
        public Int64 HProcID;//              int                --工序ID
        public Int64 HMaterID;//              int                --产品ID


 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1606,6 +1606,11 @@
                    {
                        omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
                    {
                        omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }



@@ -3551,6 +3556,11 @@
                    {
                        omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
                    {
                        omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }




 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -508,7 +508,8 @@
        public string MES_StationInBill_DeleteRelationCtl;              //进站接收单删除时是否进行关联控制
        public string MES_StationInBill_PreQtyCtl;              //本道进站数量不能大于上道出站合格数量
        public string MES_StationInBill_QtyRateCtl;              //本道进站数量汇总数不能大于流转卡数量上限
        public string MES_StationInBill_DyCentralInspectionControl;              //判断工序进站之前是否做过检验单
        public string MES_StationInBill_DyCentralInspectionControl; //判断工序进站之前是否做过检验单
        public string MES_StationInBill_DefQty;                     //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）

        //工序出站汇报单
        public string MES_StationOutBill_AutoCheck;                        //保存后是否自动审核

 WebAPI.suo

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -274,7 +274,7 @@
                string sql = string.Empty;
                //保存
                oCN.BeginTran();
                sql = $"delete Gy_Supplier where HItemID = {lsmain[0].HItemID}";
                sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Supplier on";
                oCN.RunProc(sql);
@@ -290,7 +290,7 @@
                 ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                 ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                 ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +","+lsmain[0].HMaterClass+
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+ "'" +
                  ") ");
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Supplier off";

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -115,10 +115,11 @@
                string HBillNo = list[0].HBillNo;//递入type得到的单据号
                int HBillStatus = 0;
                string HMaker = user;//制单人
                int HYear = 2021;
                double HPeriod = 1;
                int HYear = DateTime.Now.Year;
                double HPeriod = DateTime.Now.Month;
                string HRemark = list[0].HRemark;//备注
                long HICMOInterID = list[0].HICMOInterID;//任务单ID
                long HICMOEntryID = list[0].HICMOEntryID;//任务单子ID
                string HICMOBillNo = list[0].HICMOBillNo;//任务单
                long HProcPlanInterID = 0;
                long HProcPlanEntryID = 0;
@@ -144,6 +145,8 @@
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                long HPRDOrgID = list[0].HPRDOrgID;//组织ID
                double HmaterOutqty = list[0].HmaterOutqty;//白坯发布
                long HMaterToSourceInterID = list[0].HMaterToSourceInterID;//上料防错单ID
                string HMaterToSourceBillNo = list[0].HMaterToSourceBillNo;//上料防错单单据号
                //单据完整性判断
                if (HMaterID <= 0)
                {
@@ -260,6 +263,29 @@
                    ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
                    ","+ HmaterOutqty + ") ");

                    if(HMaterToSourceInterID!=0)
                    {
                        //生成上料防错单
                        //插入子表
                        oCN.RunProc("EXEC h_p_Sc_MaterToSourceBillSub_Insert " + HMaterToSourceInterID.ToString() + ",'" + HMaterToSourceBillNo + "'");
                        //插入主表
                        oCN.RunProc("Insert Into Sc_MaterToSourceBillMain   " +
                        "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                        ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate" +
                        ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                        ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
                        ",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
                        ",HGroupID,HProcNo,HStockOrgID" +
                        ") " +
                        " values('3786','3790'," + HMaterToSourceInterID.ToString() + ",'" + HMaterToSourceBillNo + "',convert(varchar(10),getdate(),120)" +
                        ",year(getdate()),month(getdate()),'工序进站绑定生成','" + HMaker + "',getdate(),'" + HMaker + "',getdate()" +
                        "," + HInterID.ToString() + ",0,'" + HBillNo + "','3790'" +
                        "," + HProcExchInterID.ToString() + "," + HProcExchEntryID.ToString() + ",'" + HProcExchBillNo + "'," + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "'" +
                        "," + HSourceID.ToString() + "," + HProcID.ToString() + "," + HMaterID.ToString() + ",'',0,0,''" +
                        "," + HGroupID.ToString() + "," + HProcNo.ToString() + "," + HPRDOrgID.ToString() +
                        ") ");
                    }
                    //写入日志
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序进站单据:" + HBillNo);
                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "新增工序进站单据：" + HBillNo + "','LMES-工序进站模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }
@@ -423,6 +449,67 @@
        }
        #endregion

        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æµæ°´å·å›žè½¦èŽ·å–工序信息，并根据系统参数判断进站单是否绑定配件清单 20240621
        [Route("Cj_StationInBill/HProcNo_KeyDown")]
        [HttpGet]
        public object HProcNo_KeyDown(string HBillNo, string HProcExchBillNo, Int64 HProcNo, string HMaker)
        {
            try
            {
                if (HProcExchBillNo.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "流转卡没有扫描，或者没有按回车键，请扫描流转卡或在流转卡文本框中按回车键！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    string MES_StationInBill_LineBindCtl = "N"; //进站接收时是否绑定该工序的配件清单（Y是需要绑定，N不需要绑定）
                    string MES_StationInBill_DefQty = "4";      //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
                    MES_StationInBill_LineBindCtl = oSystemParameter.omodel.MES_StationInBill_LineBindCtl;
                    MES_StationInBill_DefQty = oSystemParameter.omodel.MES_StationInBill_DefQty;

                    ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_HProcNo_KeyDown '" + HBillNo + "','" + HProcExchBillNo + "'," + HProcNo.ToString() + ",'" + MES_StationInBill_LineBindCtl + "','" + MES_StationInBill_DefQty + "','" + HMaker + "'", "h_p_MES_StationInBill_HProcNo_KeyDown");

                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "工序号错误或者当前工序号不允许进站，请重新输入！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "工序进站接收单流水号获取信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æµæ°´å·å›žè½¦èŽ·å–工序信息
        [Route("Cj_StationInBill/txtHProcNo_KeyDown")]
        [HttpGet]

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

@@ -987,6 +987,88 @@

        #endregion

        #region å·¥åºèµ„æ–™

        /// <summary>
        /// æ‰«ç è¿”回工序信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetProcess_Json")]
        [HttpGet]
        public object GetProcess_Json(string HBarCode, Int64 HStockOrgID)
        {
            try
            {
                Int64 HProcID = 0;
                HProcID = DBUtility.ClsPub.isLong(HBarCode);
                ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HItemID=" + HProcID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Process");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录，请确认所扫工序条码是否属于该组织，且为非禁用状态！";
                    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;
            }
        }

        /// <summary>
        /// èŽ·å–工序列表信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetProcessList_Json")]
        [HttpGet]
        public object GetProcessList_Json(string Process, Int64 HStockOrgID)
        {
            try
            {
                ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Process + "%' or HName like '%" + Process + "%')", "Gy_Process");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何工序记录！";
                    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

        #endregion


@@ -3387,6 +3469,8 @@
                BillNew.omodel.HWorkerID = mainList[0].HWorkerID;
                BillNew.omodel.HWorkerBarCode = mainList[0].HWorkerBarCode;
                BillNew.omodel.HGroupID = mainList[0].HGroupID;
                BillNew.omodel.HProcID = mainList[0].HProcID;
                BillNew.omodel.HProcNo = mainList[0].HProcNo;
                BillNew.omodel.HMainSourceBillType = mainList[0].HMainSourceBillType;
                if (mainList[0].HMainSourceBillType == "3772")
                {
@@ -5969,6 +6053,55 @@

        #endregion

        #region ä¸Šæ–™é˜²é”™å•æ‰«ç æ¨¡å—  æµæ°´å·å›žè½¦è°ƒç”¨æ–¹æ³•
        /// <summary>
        /// æµæ°´å·å›žè½¦è¿”回信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/get_ProcNo_MaterToSource_Json")]
        [HttpGet]
        public object get_ProcNo_MaterToSource_Json(Int64 HInterID, string HBillNo, string HBillType, string HProcExchBillNo, Int64 HProcNo, string HMaker)
        {
            try
            {
                ds = oCn.RunProcReturn("exec h_p_WMS_AddProcNo_MaterToSource " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HProcExchBillNo + "'," + HProcNo.ToString() + ",'" + HMaker + "'", "h_p_WMS_AddProcNo_MaterToSource");
                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

        #region ä¸Šæ–™é˜²é”™å•æ‰«ç æ¨¡å—  æ‰«æç‰©æ–™æ¡ç è°ƒç”¨æ–¹æ³•
        /// <summary>
        /// æ‰«æç‰©æ–™æ¡ç 

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

@@ -1667,6 +1667,59 @@
        }
        #endregion

        #region ç”Ÿäº§è´¨é‡æœˆæ±‡æŠ¥å•åˆ—表 æŸ¥è¯¢
        public class ReportWorkDemandPlanBill1
        {
            public string HYear;
            public string HWorkCenter;
            public string HName;

        }
        [Route("Sc_QualityReportBill/getSc_QualityReportBillMonth")]
        [HttpGet]
        public object getSc_QualityReportBillMonth(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ReportWorkDemandPlanBill1 Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill1>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMonth  '{Report.HYear}','{Report.HWorkCenter}','{Report.HName}'", "h_p_Sc_StationOutBillMonth");

                //添加列名
                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 = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


    }
}

 WebAPI/Models/StationBill.cs

@@ -88,5 +88,7 @@
        public double HToCheckQty { get; set; }
        public double HLossQty { get; set; }
        public Int64 HShiftsID { get; set; }
        public long HMaterToSourceInterID { get; set; }
        public string HMaterToSourceBillNo { 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>True|2024-06-25T04:30:32.4272933Z;True|2024-06-25T09:53:35.8089888+08:00;True|2024-06-25T09:50:45.0788666+08:00;True|2024-06-25T09:46:08.5825317+08:00;True|2024-06-25T09:44:17.5984285+08:00;True|2024-06-25T09:40:23.4977167+08:00;True|2024-06-25T09:37:55.3516214+08:00;True|2024-06-25T09:34:57.0498926+08:00;True|2024-06-24T23:22:12.1756387+08:00;True|2024-06-24T23:15:13.9995277+08:00;True|2024-06-24T23:05:20.8658324+08:00;True|2024-06-24T22:59:59.2842726+08:00;True|2024-06-24T16:29:08.9135923+08:00;True|2024-06-24T15:44:19.8100242+08:00;True|2024-06-18T16:08:52.3066991+08:00;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;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>
    <History>True|2024-06-25T04:33:00.3560503Z;True|2024-06-25T12:30:32.4272933+08:00;True|2024-06-25T09:53:35.8089888+08:00;True|2024-06-25T09:50:45.0788666+08:00;True|2024-06-25T09:46:08.5825317+08:00;True|2024-06-25T09:44:17.5984285+08:00;True|2024-06-25T09:40:23.4977167+08:00;True|2024-06-25T09:37:55.3516214+08:00;True|2024-06-25T09:34:57.0498926+08:00;True|2024-06-24T23:22:12.1756387+08:00;True|2024-06-24T23:15:13.9995277+08:00;True|2024-06-24T23:05:20.8658324+08:00;True|2024-06-24T22:59:59.2842726+08:00;True|2024-06-24T16:29:08.9135923+08:00;True|2024-06-24T15:44:19.8100242+08:00;True|2024-06-18T16:08:52.3066991+08:00;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;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>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>06/25/2024 12:30:16</publishTime>
      <publishTime>06/25/2024 12:32:51</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/25/2024 12:30:16</publishTime>
      <publishTime>06/25/2024 12:32:51</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/25/2024 12:30:15</publishTime>
      <publishTime>06/25/2024 12:32:50</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/25/2024 12:30:15</publishTime>
      <publishTime>06/25/2024 12:32:50</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>06/25/2024 12:30:13</publishTime>
      <publishTime>06/25/2024 12:32:48</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/25/2024 12:30:13</publishTime>
      <publishTime>06/25/2024 12:32:48</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>06/25/2024 12:30:13</publishTime>
      <publishTime>06/25/2024 12:32:48</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/25/2024 12:30:13</publishTime>
      <publishTime>06/25/2024 12:32:48</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>06/25/2024 12:30:11</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>06/25/2024 12:30:11</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>06/25/2024 12:30:12</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>06/25/2024 12:30:12</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/25/2024 12:30:12</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/25/2024 12:30:12</publishTime>
      <publishTime>06/25/2024 12:32:47</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -282,10 +282,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/25/2024 12:30:22</publishTime>
      <publishTime>06/25/2024 12:32:55</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/25/2024 12:30:22</publishTime>
      <publishTime>06/25/2024 12:32:55</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -480,7 +480,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/25/2024 12:30:31</publishTime>
      <publishTime>06/25/2024 12:32:59</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />