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

yusijie

2024-10-23 a791fe4183fd04c67ed2277303a56fd646583d88

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

 DAL/¹¤×ʹÜÀí/ClsHR_EmployeeSkillExamBill.cs

@@ -54,6 +54,7 @@
                "',HMaterID='" + omodel.HMaterID.ToString() +
                "',HProcID='" + omodel.HProcID.ToString() +
                "',HSourceID='" + omodel.HSourceID.ToString() +
                "',HDivisionID='" + omodel.HDivisionID.ToString() +
                "',HOrgID='" + omodel.HOrgID.ToString() + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
@@ -99,13 +100,13 @@
                oCn.RunProc("Insert Into HR_EmployeeSkillExamBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HDeptID,HGroupID,HCheckEmpID,HMaterID,HProcID,HSourceID,HOrgID" +
                ",HDeptID,HGroupID,HCheckEmpID,HMaterID,HProcID,HSourceID,HOrgID,HDivisionID" +
                ",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                ",'" + omodel.HDeptID.ToString() + "'," + omodel.HGroupID.ToString() + "," + omodel.HCheckEmpID + "," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HSourceID.ToString() + "," + omodel.HOrgID.ToString() + ",'" + omodel.HMainSourceBillType + 
                "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'" +
                ",'" + omodel.HDeptID.ToString() + "'," + omodel.HGroupID.ToString() + "," + omodel.HCheckEmpID + "," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HSourceID.ToString() + "," + omodel.HOrgID.ToString() + "," + omodel.HDivisionID.ToString() + "" +
                ",'" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsHR_EmployeeSkillExamBillSub oSub in DetailColl)

 DAL/Éú²ú¹ÜÀí/ClsSc_QualityReportBill.cs

@@ -88,7 +88,7 @@
                      ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                      ",HBarCode,HReportType,HBadProcID" +
                      ",HAddr,HMaker,HMakeDate,HProcID" +
                      ",HAddr,HMaker,HMakeDate,HProcID,HNowProcID" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + oSub.HEntryID.ToString() + "" +
@@ -122,7 +122,8 @@
                      "','" + oSub.HAddr + "'" +
                      ",'" + oSub.HMaker + "'" +
                      ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                      "," + oSub.HProcID +
                      "," + oSub.HProcID.ToString() +
                      "," + oSub.HNowProcID.ToString() +
                      ") ";
                    oCn.RunProc(subSql);
                }
@@ -222,7 +223,7 @@
                      ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                      ",HBarCode,HReportType,HBadProcID" +
                      ",HAddr,HMaker,HMakeDate,HProcID" +
                      ",HAddr,HMaker,HMakeDate,HProcID,HNowProcID" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + oSub.HEntryID.ToString() + "" +
@@ -256,7 +257,8 @@
                      ",'" + oSub.HAddr + "'" +
                      ",'" + oSub.HMaker + "'" +
                      ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                      "," + oSub.HProcID +
                      "," + oSub.HProcID.ToString() +
                      "," + oSub.HNowProcID.ToString() +
                      ") ";
                    oCn.RunProc(subSql);
                }

 Model/¹¤×ʹÜÀí/ClsHR_EmployeeSkillExamBillMain.cs

@@ -14,5 +14,6 @@
        public Int64 HProcID;//        å·¥åº    
        public Int64 HSourceID;//        ç”Ÿäº§èµ„源    
        public Int64 HOrgID;//        ç»„织    
        public Int64 HDivisionID;//        äº‹ä¸šéƒ¨	
    }
}

 Model/Éú²ú¹ÜÀí/ClsSc_QualityReportBillSub.cs

@@ -29,5 +29,6 @@
        public string HResult;          //判断结果
        public int HGroupID;//班组
        public int HBadProcID;//班组
        public int HNowProcID;//当前工序
    }
}

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -1732,6 +1732,11 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    //=======JIT

@@ -3857,8 +3862,12 @@
                    {
                        omodel.Gy_RoutingBill_SaveAutoLastProc = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Gy_RoutingBill_EnableMultiLevel")
                    {
                        omodel.Gy_RoutingBill_EnableMultiLevel = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }

                    




 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -630,7 +630,7 @@
        public string Gy_RoutingBill_SaveAutoAddnew;                //保存后变为新增状态
        public string Gy_RoutingBill_DeleterAndMakerMustSame;       //删除人必须是制单人
        public string Gy_RoutingBill_SaveAutoLastProc;              //保存到数据库时自动加上转工序

        public string Gy_RoutingBill_EnableMultiLevel;              //工艺路线是否启用多级审批，启用多级审批要求普通审批不启用

        ////工序进站单
        //public string MES_StationBill_ProcNo; //自动匹配流水号

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -9,4 +9,3 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs

@@ -28,6 +28,8 @@
        public Int64 HInterID = 0;
        public string HBillNo = "";
        public string HBillType = "1202";
        public Int64 HMaterID = 0;
        public string HBatchNo = "";
        public Int64 HAuxPropID = 0;
        public Int64 HUnitID = 0;
        public Int64 HWhID = 0;
@@ -48,6 +50,8 @@
        public string PrintQtyCtl = "";         //条码打印次数控制
        public string UpdatePrintQtyCtl = "";   //条码打印次数更新
        public string sBarCodeItemID = "";      //条码自增列
        public string HBarCode_Pack = "";       //托条码
        public long HSNo = 0;                   //组托计数用
        public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -113,11 +117,15 @@
            {
                HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);           //得到新单据ID
                HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);    //得到新单据号
                HSNo = 0;
                this.lblSNo.Text = "";
            }
            else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
            {
                HInterID = DBUtility.ClsPub.CreateBillID_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);           //得到新单据ID
                HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);    //得到新单据号
                HSNo = 0;
                this.lblSNo.Text = "";
            }
            else
            {
@@ -129,7 +137,7 @@
            if (grdSub.Rows.Count > 0)
            {
                grdSub.Rows[0].Selected = true;
                SourceBill();
                SourceBill(1);
                txtHQty.Focus();
            }
            else
@@ -328,6 +336,12 @@
                return false;
            }

            if (DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text) != "")
            {
                MessageBox.Show("当前组托未结束，请结束组托后再点击换班！", "提示");
                return false;
            }

            //判断会计期是否合理
            string s = "";
            int sYear = 0;
@@ -413,8 +427,7 @@
                }
                Source_Display();
                grdSub.Rows[0].Selected = true;
                DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
                SourceBill();
                SourceBill(2);
                txtHBarCode.Text = "";
                txtHQty.Focus();
            }
@@ -430,8 +443,7 @@
            }
            Source_Display();
            grdSub.Rows[0].Selected = true;
            DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
            SourceBill();
            SourceBill(2);
            txtHBarCode.Text = "";
            txtHQty.Focus();
        }
@@ -462,11 +474,6 @@

        private void cmdSourceBillNo_Click(object sender, EventArgs e)
        {
            //初始化右边表头信息
            cmbHBarCodeType.Items.Clear();
            cmbHBarCodeType.Items.Add("唯一条码");
            DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);

            if (grdSub.CurrentRow == null)
            {
                MessageBox.Show("请在左边单据列表中选择一行单据！", "提示");
@@ -479,7 +486,7 @@
            }
            else
            {
                SourceBill();
                SourceBill(3);
                txtHQty.Focus();
            }
        }
@@ -496,6 +503,10 @@
            }
            SaveBarCode();
            BarCode_Display();
            if (DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text) != "")
            {
                this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
            }
            grdMain.Rows[0].Selected = true;

            sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
@@ -703,7 +714,6 @@
            Int64 HBadReasonID = 0;     //不良原因ID
            string HCusMaterName = "";  //客户物料名称
            string HCusModel = "";      //客户规格型号
            string HBarCode_Pack = "";  //托盘条码

            HBarCode = TM;
            HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);
@@ -720,7 +730,10 @@
            HBadReasonID = DBUtility.ClsPub.isLong(txtHRemark.Tag);
            HCusMaterName = DBUtility.ClsPub.isStrNull(txtHCusMaterName.Text);
            HCusModel = DBUtility.ClsPub.isStrNull(txtHCusModel.Text);
            HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);
            if (HBarCode_Pack != "")
            {
                HSNo = HSNo + 1;
            }

            try
            {
@@ -734,7 +747,7 @@
                ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag,HBarCode_Pack " +
                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo,HPackflag " +
                ") Values ("
                + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
                + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + HMaker + "',getdate(),0," + HQty.ToString()
@@ -743,7 +756,7 @@
                + ", 0,'',getdate(),'','" + sDate + "'," + HMaterialJQty.ToString() + "," + HMaterialMQty.ToString() + "," + HNowQty.ToString()
                + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0,'" + HBarCode_Pack + "'"
                + ", " + HProcessExchangeInterID.ToString() + ",0,'" + HProcessExchangeBillNo + "'," + HBadReasonID.ToString() + ",'" + HCusMaterName + "','" + HCusModel + "'"
                + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1')");
                + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1',0)");

                //回填最大流水号
                oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
@@ -782,9 +795,53 @@

        #region  //返回信息

        //返回源单列表信息
        private void SourceBill()
        //返回源单列表信息(num=1，打开模块时加载显示；num=2，扫流转卡显示；num=3，选单按钮显示)
        private void SourceBill(int num)
        {
            //打开模块时加载显示
            if (num == 1)
            {
                txtHBarCode_Pack.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HBarCode_Pack")].Value);
                HBarCode_Pack = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HBarCode_Pack")].Value);
                HSNo = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSNo")].Value);
                if (HBarCode_Pack == "")
                {
                    this.lblSNo.Text = "";
                }
                else
                {
                    this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
                    cmdHBPack.Enabled = false;
                }
            }
            //扫流转卡显示
            if (num == 2)
            {
                //初始化右边表头信息
                DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
                if (HBarCode_Pack != "")
                {
                    txtHBarCode_Pack.Text = HBarCode_Pack;
                    this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
                }
            }
            //选单按钮显示
            if (num == 3)
            {
                if (HBarCode_Pack != "" && (HMaterID != DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterID")].Value)
                    || HBatchNo != DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("批号")].Value)))
                {
                    MessageBox.Show("所扫描流转卡对应物料、批号与当前正在组托物料、批号不一致，不同物料、批号不允许组托在同一托上，如需换物料生成条码请先结束当前组托！", "提示");
                    return;
                }
                //初始化右边表头信息
                DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
                if (HBarCode_Pack != "")
                {
                    txtHBarCode_Pack.Text = HBarCode_Pack;
                    this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
                }
            }
            txtHBillNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("单据号")].Value);
            txtHDeptName.Tag = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HDeptID")].Value);
            txtHDeptName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("车间")].Value);
@@ -795,6 +852,8 @@
            txtHBatchNo.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("批号")].Value);
            txtHCusMaterName.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusMaterName")].Value);
            txtHCusModel.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HCusModel")].Value);
            HMaterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterID")].Value);
            HBatchNo = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("批号")].Value);
            HAuxPropID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HAuxPropID")].Value);
            HUnitID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HUnitID")].Value);
            HWhID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HWhID")].Value);
@@ -874,6 +933,7 @@
                    string HItemID = "";
                    string HBarCode = "";
                    string HBarCode2 = "";
                    long HSNo_Temp = HSNo;
                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
                    {
                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
@@ -890,14 +950,35 @@
                        {
                            HRemark = HRemark + "、" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value);
                        }
                        //更新当前已组托件数
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != ""
                            && DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack
                            && DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) != "托盘条码")
                        {
                            HSNo = HSNo - 1;
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) == "托盘条码")
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸å…è®¸ä½œåºŸï¼", "提示");
                            return;
                            if (DBUtility.ClsPub.isBool(grdMain.SelectedRows[i].Cells[Fun_GetCol("HPackflag")].Value))
                            {
                                MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸”已组托生成对应组托单，不允许作废！", "提示");
                                return;
                            }
                            else if (HSNo > 0)
                            {
                                MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸”当前托盘条码下已生成对应条码，不允许作废！", "提示");
                                return;
                            }
                            else
                            {
                                HBarCode_Pack = "";
                            }
                        }
                    }
                    if (HRemark != "")
                    {
                        HSNo = HSNo_Temp;
                        HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);
                        MessageBox.Show("所选条码编号："+ HRemark.Remove(0, 1)+" å·²ä½œåºŸï¼Œä¸å…è®¸é‡å¤ä½œåºŸï¼", "提示");
                        return;
                    }
@@ -925,11 +1006,23 @@
                    catch (Exception e2)
                    {
                        oCn.RollBack();
                        HSNo = HSNo_Temp;
                        HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);
                        MessageBox.Show("作废条码失败！" + e2.Message, "提示");
                        return;
                    }
                    //刷新称重记录列表信息
                    BarCode_Display();
                    if (HBarCode_Pack != "")
                    {
                        this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
                    }
                    else
                    {
                        txtHBarCode_Pack.Text = "";
                        this.lblSNo.Text = "";
                        cmdHBPack.Enabled = true;
                    }
                    MessageBox.Show("所选条码编号：" + HBarCode.Remove(0, 1) + " ä½œåºŸæˆåŠŸï¼", "提示");
                }
            }
@@ -957,7 +1050,27 @@
                    string HItemID = "";
                    string HBarCode = "";
                    string HBarCode2 = "";
                    string HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);
                    long HSNo_Temp = HSNo;
                    bool HFlag = false;

                    //界面上为未启用组托状态
                    if (HBarCode_Pack == "")
                    {
                        for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
                        {
                            //判断条码是否为托盘条码，未生成组托单，已作废状态，界面上为未组托状态
                            if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) == "托盘条码"
                                && DBUtility.ClsPub.isBool(grdMain.SelectedRows[i].Cells[Fun_GetCol("HPackflag")].Value) == false
                                && DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("作废标记")].Value) != ""
                                )
                            {
                                HFlag = true;
                                HBarCode_Pack = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value);
                                break;
                            }
                        }
                    }

                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
                    {
                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
@@ -974,20 +1087,44 @@
                        {
                            HRemark = HRemark + "、" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value);
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) == "托盘条码")

                        //条码为组托条码
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != "")
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " ä¸ºæ‰˜ç›˜æ¡ç ï¼Œä¸å…è®¸åä½œåºŸï¼", "提示");
                            return;
                        }
                        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != ""
                            && DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) != HBarCode_Pack)
                        {
                            MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " å·²ç”Ÿæˆå¯¹åº”组托单，不允许反作废！", "提示");
                            return;
                            //已上传生成组托单
                            if (DBUtility.ClsPub.isBool(grdMain.SelectedRows[i].Cells[Fun_GetCol("HPackflag")].Value))
                            {

                            }
                            //未上传生成组托单
                            else
                            {
                                //条码对应托条码和界面上的托条码一致
                                if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack)
                                {
                                    //更新当前已组托件数
                                    if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码类型")].Value) != "托盘条码")
                                    {
                                        HSNo = HSNo + 1;
                                    }

                                }
                                //条码对应托条码和界面上的托条码不一致
                                else
                                {
                                    MessageBox.Show("所选条码编号：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("条码编号")].Value) + " å¯¹åº”托条码：" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) + " å·²ç”Ÿæˆç»„托单，或已作废，不允许反作废！", "提示");
                                    return;
                                }
                            }
                        }
                    }
                    if (HRemark != "")
                    {
                        HSNo = HSNo_Temp;
                        if(HFlag)
                        {
                            HBarCode_Pack = "";
                        }
                        MessageBox.Show("所选条码编号：" + HRemark.Remove(0, 1) + " æœªä½œåºŸï¼Œä¸å…è®¸åä½œåºŸï¼", "提示");
                        return;
                    }
@@ -1023,7 +1160,7 @@
                        ",0,0,'',0,'',0" +
                        ",HSTOCKORGID,HSTOCKORGID,HSTOCKORGID,'','称重入库生成-反作废','2'" +
                        ",0,0,'',0" +
                        "from Gy_BarCodeBill with(nolock) where HItemID in (" + HItemID + ")"
                        "from Gy_BarCodeBill with(nolock) where HItemID in (" + HItemID + ") and HBarCodeType='唯一条码' "
                        );

                        //写入系统日志
@@ -1036,11 +1173,28 @@
                    catch (Exception e2)
                    {
                        oCn.RollBack();
                        HSNo = HSNo_Temp;
                        if (HFlag)
                        {
                            HBarCode_Pack = "";
                        }
                        MessageBox.Show("反作废条码失败！" + e2.Message, "提示");
                        return;
                    }
                    //刷新称重记录列表信息
                    BarCode_Display();
                    if (HBarCode_Pack != "")
                    {
                        txtHBarCode_Pack.Text = HBarCode_Pack;
                        this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
                        cmdHBPack.Enabled = false;
                    }
                    else
                    {
                        txtHBarCode_Pack.Text = "";
                        this.lblSNo.Text = "";
                        cmdHBPack.Enabled = true;
                    }
                    MessageBox.Show("所选条码编号：" + HBarCode.Remove(0, 1) + " åä½œåºŸæˆåŠŸï¼", "提示");
                }
            }
@@ -1069,23 +1223,25 @@
            {
                return;
            }
            HSNo = 0;
            SavePackBarCode();
            BarCode_Display();
            this.lblSNo.Text = "当前已组 " + HSNo + " ä»¶";
            grdMain.Rows[0].Selected = true;

            txtHBarCode_Pack.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("条码编号")].Value);
            HBarCode_Pack = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("条码编号")].Value);
            cmdHBPack.Enabled = false;

            sBarCodeItemID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[0].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
            //自动打印
            if (chkHDYFlag.Checked == true)
            {
                //打印条码
                Sub_SetReport("托盘条码");
                Report.Print(false);
                Thread.Sleep(1000);
            }
            else
            //if (chkHDYFlag.Checked == true)
            //{
            //    //打印条码
            //    Sub_SetReport("托盘条码");
            //    Report.Print(false);
            //    Thread.Sleep(1000);
            //}
            //else
            {
                //选择打印模板
                BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
@@ -1118,6 +1274,11 @@
            if (HInterID == 0 || HBillNo == "")
            {
                MessageBox.Show("获取条码对应单据ID或单据号失败，请重新刷新界面！", "提示");
                return false;
            }
            if (HProcessExchangeInterID == 0)
            {
                MessageBox.Show("请先扫描流转卡号！", "提示");
                return false;
            }
            return true;
@@ -1158,10 +1319,24 @@
            TM = sTMNumber + LSH2;

            string HBarCode = "";
            string HBarCodeType = "托盘条码";
            string HBarCodeType = "";
            string HMaterID = "";       //物料内码
            string HBatchNo = "";       //批次
            string HMaterName = "";
            string HMaterModel = "";
            string HProcessExchangeBillNo = "";
            string HCusMaterName = "";  //客户物料名称
            string HCusModel = "";      //客户规格型号

            HBarCode = TM;
            HBarCodeType = "";
            HBarCodeType = "托盘条码";
            HMaterID = DBUtility.ClsPub.isStrNull(txtHMaterNumber.Tag);
            HBatchNo = DBUtility.ClsPub.isStrNull(txtHBatchNo.Text);
            HMaterName = DBUtility.ClsPub.isStrNull(txtHMaterName.Text);
            HMaterModel = DBUtility.ClsPub.isStrNull(txtHMaterModel.Text);
            HProcessExchangeBillNo = DBUtility.ClsPub.isStrNull(txtHBillNo.Text);
            HCusMaterName = DBUtility.ClsPub.isStrNull(txtHCusMaterName.Text);
            HCusModel = DBUtility.ClsPub.isStrNull(txtHCusModel.Text);

            try
            {
@@ -1175,16 +1350,16 @@
                ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate,HMaterialJQty,HMaterialMQty,HNowQty " +
                ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag " +
                ",HOrderInterID,HOrderEntryID,HOrderBillNo,HCustomQty1,HMaterialModel,HCusModel " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo " +
                ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HLogo,HPackflag " +
                ") Values ("
                + "'" + HBarCode + "','" + HBarCodeType + "',0,0,1,'" + HBarCode + "'"
                + ",'',0,0,'" + HMaker + "',getdate(),0,1"
                + ",0,0,'','',''"
                + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + ",1,'" + HBarCode + "'"
                + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + HMaker + "',getdate(),0,1"
                + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "',''"
                + ",1,0,0,0,0,''"
                + ", 0,'',getdate(),'','" + sDate + "',0,0,0"
                + ", " + HStockOrgID.ToString() + "," + HStockOrgID.ToString() + ",''," + HInterID.ToString() + ",0"
                + ", " + HProcessExchangeInterID.ToString() + ",0,'',0,'',''"
                + ",'','','',0,'','','1')");
                + ", " + HProcessExchangeInterID.ToString() + ",0,'" + HProcessExchangeBillNo + "',0,'" + HCusMaterName + "','" + HCusModel + "'"
                + ",'" + HMaterName + "','" + HMaterModel + "',''," + HAuxPropID.ToString() + ",'','','1',0)");

                //回填最大流水号
                oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "',1 ");
@@ -1203,8 +1378,6 @@
        #region  //结束组托
        private void cmdHEPack_Click(object sender, EventArgs e)
        {
            string HBarCode_Pack = DBUtility.ClsPub.isStrNull(txtHBarCode_Pack.Text);

            //生成组托单前判断
            if(HBarCode_Pack=="")
            {
@@ -1215,7 +1388,8 @@
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("条码类型")].Value) == "唯一条码"
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack)
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("HBarCode_Pack")].Value) == HBarCode_Pack
                    && DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[Fun_GetCol("作废标记")].Value) == "")
                {
                    b = true;
                    break;
@@ -1261,18 +1435,25 @@
                ",HAuxPropID,HBatchNo,HMTONo" +
                ",HSourceID,HEquipID,HGroupID,HWorkerID,HStatus" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType) " +
                " select " + HPUInterID.ToString() + ",HItemID,'0,0,''" +
                " select " + HPUInterID.ToString() + ",HItemID,0,0,''" +
                ",HMaterID,HUnitID,HQty,HBarCode,HBarCode_Pack,getdate()" +
                ",HAuxPropID,HBatchNo,HMTONo" +
                ",0,0,0,0,0" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                "from Gy_BarCodeBill with(nolock) where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0"
                " from Gy_BarCodeBill with(nolock) where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0 and HBarCodeType='唯一条码' "
                );

                //回填条码档案组托标记
                oCn.RunProc("update Gy_BarCodeBill set HPackflag=1 where HInterID=" + HInterID.ToString() + " and HBarCode_Pack='" + HBarCode_Pack + "' and HStopflag=0", ref DBUtility.ClsPub.sExeReturnInfo);

                MessageBox.Show("生成生产组托单：" + HPUBillNo + " æˆåŠŸï¼", "提示");

                txtHBarCode_Pack.Text = "";
                HBarCode_Pack = "";
                cmdHBPack.Enabled = true;
                HSNo = 0;
                this.lblSNo.Text = "";
                BarCode_Display();
                oCn.Commit();
                return;
            }

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.designer.cs

@@ -30,8 +30,8 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
            this.Tool = new System.Windows.Forms.ToolStrip();
            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
            this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -55,6 +55,11 @@
            this.label4 = new System.Windows.Forms.Label();
            this.txtHMaterNumber = new System.Windows.Forms.TextBox();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.lblSNo = new System.Windows.Forms.Label();
            this.label18 = new System.Windows.Forms.Label();
            this.txtHBarCode_Pack = new System.Windows.Forms.TextBox();
            this.cmdHEPack = new System.Windows.Forms.Button();
            this.cmdHBPack = new System.Windows.Forms.Button();
            this.textBox_COM = new System.Windows.Forms.TextBox();
            this.label_COM = new System.Windows.Forms.Label();
            this.button_OpenCom = new System.Windows.Forms.Button();
@@ -106,10 +111,6 @@
            this.右侧 = new System.Windows.Forms.Panel();
            this.timer2 = new System.Windows.Forms.Timer(this.components);
            this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
            this.cmdHBPack = new System.Windows.Forms.Button();
            this.cmdHEPack = new System.Windows.Forms.Button();
            this.label18 = new System.Windows.Forms.Label();
            this.txtHBarCode_Pack = new System.Windows.Forms.TextBox();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.gbUp.SuspendLayout();
@@ -282,14 +283,14 @@
            this.grdMain.AllowUserToDeleteRows = false;
            this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdMain.Location = new System.Drawing.Point(3, 3);
            this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -366,6 +367,7 @@
            // gbUp
            // 
            this.gbUp.BackColor = System.Drawing.Color.Transparent;
            this.gbUp.Controls.Add(this.lblSNo);
            this.gbUp.Controls.Add(this.label18);
            this.gbUp.Controls.Add(this.txtHBarCode_Pack);
            this.gbUp.Controls.Add(this.cmdHEPack);
@@ -419,6 +421,64 @@
            this.gbUp.TabIndex = 58;
            this.gbUp.TabStop = false;
            // 
            // lblSNo
            // 
            this.lblSNo.AutoSize = true;
            this.lblSNo.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblSNo.ForeColor = System.Drawing.Color.Red;
            this.lblSNo.Location = new System.Drawing.Point(843, 158);
            this.lblSNo.Name = "lblSNo";
            this.lblSNo.Size = new System.Drawing.Size(20, 19);
            this.lblSNo.TabIndex = 334;
            this.lblSNo.Text = ".";
            // 
            // label18
            // 
            this.label18.AutoSize = true;
            this.label18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label18.ForeColor = System.Drawing.Color.Black;
            this.label18.Location = new System.Drawing.Point(638, 116);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(53, 12);
            this.label18.TabIndex = 332;
            this.label18.Text = "托盘条码";
            // 
            // txtHBarCode_Pack
            // 
            this.txtHBarCode_Pack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode_Pack.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode_Pack.Location = new System.Drawing.Point(693, 112);
            this.txtHBarCode_Pack.Name = "txtHBarCode_Pack";
            this.txtHBarCode_Pack.ReadOnly = true;
            this.txtHBarCode_Pack.Size = new System.Drawing.Size(128, 21);
            this.txtHBarCode_Pack.TabIndex = 333;
            // 
            // cmdHEPack
            // 
            this.cmdHEPack.BackColor = System.Drawing.Color.White;
            this.cmdHEPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHEPack.Location = new System.Drawing.Point(847, 89);
            this.cmdHEPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHEPack.Name = "cmdHEPack";
            this.cmdHEPack.Size = new System.Drawing.Size(86, 44);
            this.cmdHEPack.TabIndex = 331;
            this.cmdHEPack.Text = "结束组托";
            this.cmdHEPack.UseVisualStyleBackColor = false;
            this.cmdHEPack.Click += new System.EventHandler(this.cmdHEPack_Click);
            // 
            // cmdHBPack
            // 
            this.cmdHBPack.BackColor = System.Drawing.Color.White;
            this.cmdHBPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHBPack.Location = new System.Drawing.Point(847, 28);
            this.cmdHBPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHBPack.Name = "cmdHBPack";
            this.cmdHBPack.Size = new System.Drawing.Size(86, 44);
            this.cmdHBPack.TabIndex = 330;
            this.cmdHBPack.Text = "开始组托";
            this.cmdHBPack.UseVisualStyleBackColor = false;
            this.cmdHBPack.Click += new System.EventHandler(this.cmdHBPack_Click);
            // 
            // textBox_COM
            // 
            this.textBox_COM.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -444,7 +504,7 @@
            this.button_OpenCom.BackColor = System.Drawing.Color.White;
            this.button_OpenCom.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_OpenCom.Location = new System.Drawing.Point(429, 222);
            this.button_OpenCom.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.button_OpenCom.Margin = new System.Windows.Forms.Padding(2);
            this.button_OpenCom.Name = "button_OpenCom";
            this.button_OpenCom.Size = new System.Drawing.Size(86, 32);
            this.button_OpenCom.TabIndex = 327;
@@ -457,7 +517,7 @@
            this.button_getHWeight.BackColor = System.Drawing.Color.White;
            this.button_getHWeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.button_getHWeight.Location = new System.Drawing.Point(322, 222);
            this.button_getHWeight.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.button_getHWeight.Margin = new System.Windows.Forms.Padding(2);
            this.button_getHWeight.Name = "button_getHWeight";
            this.button_getHWeight.Size = new System.Drawing.Size(86, 32);
            this.button_getHWeight.TabIndex = 326;
@@ -568,7 +628,7 @@
            // 
            this.chkHDYFlag.AutoSize = true;
            this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
            this.chkHDYFlag.Name = "chkHDYFlag";
            this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
            this.chkHDYFlag.TabIndex = 316;
@@ -580,7 +640,7 @@
            this.cmdFZF.BackColor = System.Drawing.Color.White;
            this.cmdFZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdFZF.Location = new System.Drawing.Point(729, 222);
            this.cmdFZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
            this.cmdFZF.Name = "cmdFZF";
            this.cmdFZF.Size = new System.Drawing.Size(86, 32);
            this.cmdFZF.TabIndex = 157;
@@ -593,7 +653,7 @@
            this.cmdZF.BackColor = System.Drawing.Color.White;
            this.cmdZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdZF.Location = new System.Drawing.Point(635, 222);
            this.cmdZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
            this.cmdZF.Name = "cmdZF";
            this.cmdZF.Size = new System.Drawing.Size(86, 32);
            this.cmdZF.TabIndex = 156;
@@ -729,7 +789,7 @@
            this.cmdSave.BackColor = System.Drawing.Color.White;
            this.cmdSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSave.Location = new System.Drawing.Point(209, 222);
            this.cmdSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
            this.cmdSave.Name = "cmdSave";
            this.cmdSave.Size = new System.Drawing.Size(86, 32);
            this.cmdSave.TabIndex = 139;
@@ -753,7 +813,7 @@
            this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
            this.cmdSourceBillNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
            this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
            this.cmdSourceBillNo.TabIndex = 138;
@@ -778,7 +838,7 @@
            this.cmbHBarCodeType.Items.AddRange(new object[] {
            "唯一条码"});
            this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
            this.cmbHBarCodeType.TabIndex = 139;
@@ -799,7 +859,7 @@
            this.dtpHDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
            this.dtpHDate.Location = new System.Drawing.Point(303, 28);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
            this.dtpHDate.Name = "dtpHDate";
            this.dtpHDate.Size = new System.Drawing.Size(128, 21);
            this.dtpHDate.TabIndex = 100;
@@ -821,14 +881,14 @@
            this.grdSub.AllowUserToDeleteRows = false;
            this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.Location = new System.Drawing.Point(0, 73);
            this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -855,7 +915,7 @@
            this.tabPage1.Controls.Add(this.grdMain);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage1.Size = new System.Drawing.Size(984, 340);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "称重记录";
@@ -910,7 +970,7 @@
            this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
            this.cmdOK.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdOK.Location = new System.Drawing.Point(189, 33);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(2);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(55, 27);
            this.cmdOK.TabIndex = 150;
@@ -963,53 +1023,6 @@
            // timer2
            // 
            this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
            // 
            // cmdHBPack
            // 
            this.cmdHBPack.BackColor = System.Drawing.Color.White;
            this.cmdHBPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHBPack.Location = new System.Drawing.Point(847, 40);
            this.cmdHBPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHBPack.Name = "cmdHBPack";
            this.cmdHBPack.Size = new System.Drawing.Size(86, 32);
            this.cmdHBPack.TabIndex = 330;
            this.cmdHBPack.Text = "开始组托";
            this.cmdHBPack.UseVisualStyleBackColor = false;
            this.cmdHBPack.Click += new System.EventHandler(this.cmdHBPack_Click);
            // 
            // cmdHEPack
            // 
            this.cmdHEPack.BackColor = System.Drawing.Color.White;
            this.cmdHEPack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdHEPack.Location = new System.Drawing.Point(847, 94);
            this.cmdHEPack.Margin = new System.Windows.Forms.Padding(2);
            this.cmdHEPack.Name = "cmdHEPack";
            this.cmdHEPack.Size = new System.Drawing.Size(86, 32);
            this.cmdHEPack.TabIndex = 331;
            this.cmdHEPack.Text = "结束组托";
            this.cmdHEPack.UseVisualStyleBackColor = false;
            this.cmdHEPack.Click += new System.EventHandler(this.cmdHEPack_Click);
            // 
            // label18
            // 
            this.label18.AutoSize = true;
            this.label18.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label18.ForeColor = System.Drawing.Color.Black;
            this.label18.Location = new System.Drawing.Point(638, 116);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(53, 12);
            this.label18.TabIndex = 332;
            this.label18.Text = "托盘条码";
            // 
            // txtHBarCode_Pack
            // 
            this.txtHBarCode_Pack.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode_Pack.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode_Pack.Location = new System.Drawing.Point(693, 112);
            this.txtHBarCode_Pack.Name = "txtHBarCode_Pack";
            this.txtHBarCode_Pack.ReadOnly = true;
            this.txtHBarCode_Pack.Size = new System.Drawing.Size(128, 21);
            this.txtHBarCode_Pack.TabIndex = 333;
            // 
            // Kf_WeighToBarCode
            // 
@@ -1124,5 +1137,6 @@
        private System.Windows.Forms.Button cmdHBPack;
        private System.Windows.Forms.Label label18;
        private System.Windows.Forms.TextBox txtHBarCode_Pack;
        private System.Windows.Forms.Label lblSNo;
    }
}

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -131,7 +131,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

 WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs

@@ -78,6 +78,61 @@
        }

        /// <summary>
        /// è¿”回工艺列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_TechnologyParameter/list1")]
        [HttpGet]
        public object list1(string sWhere, string user, string Organization)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameter", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HEquipNumber = dic["HEquipNumber"].ToString();//设备
                string HProcName = dic["HProcName"].ToString();
                string HMaterName = dic["HMaterName"].ToString();

                ds = oCN.RunProcReturn("exec h_p_Gy_TechnologyParameterList '" + HEquipNumber + "','" + HProcName + "','" + HMaterName + "','" + 2 + "'", "h_p_Gy_TechnologyParameterList");

              
                //添加列名
                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;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -464,6 +464,7 @@
                    ",HShiftsID=" + HShiftsID +
                    ",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
                    ",HMouldID=" + HMouldID +
                    ",HGroupID=" + HGroupID +
                    " where HInterID=" + HInterID);

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -828,7 +828,7 @@
                string sql = string.Format(@"select æµæ°´å· HProcNo,HProcID,工序代码 HProcNumber,工序名称 HProcName,加工说明 HWorkRemark,HCenterID,工作中心代码 HCenterNumber,
                                                å·¥ä½œä¸­å¿ƒ HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust HSupFlag,计划数量 HQty,加工单价 HOutPrice, è¡¨ä½“备注 HRemark,
                                            è¿›ç«™å…³è”数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            è‰¯çŽ‡ HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
                                            è‰¯çŽ‡ HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,HSourceID,
                                            åŠ å·¥è½¦é—´ä»£ç  HDeptNumber,加工车间 HDeptName,出站报废关联数量 HRelationQty_OutBad,SN过站控制 HSNCtrl,HRoutingInterID HRoutingBillMainID,HRoutingEntryID HRoutingBillEntryID
                                            from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + "  order by cast(流水号 as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
@@ -1960,7 +1960,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

 WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs

@@ -1576,15 +1576,21 @@
                string HInterId = dic["HInterId"].ToString();             

                ds = oCN.RunProcReturn("exec h_p_DotCheckDayList '" + Type + "','" + HInterId + "'", "h_p_DotCheckDayList");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当月没有数据产生！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //添加列名
                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！";

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -375,7 +375,7 @@
                if (HStandard)
                {
                    //设置默认工艺路线
                    oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);  //设置默认工艺路线
                    oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
                }
             
                //判断是否重复工序号
@@ -1655,6 +1655,20 @@
                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);      //对HInterID进行类型的转换
                DAL.ClsGy_RoutingBill oBill = new DAL.ClsGy_RoutingBill();                              //实例化单据操作类，用于进行相关操作
                //获取系统参数判断工艺路线是否启用多级审批禁用
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "N") //系统参数  æœªå¯ç”¨è‡ªåŠ¨å®¡æ ¸ 
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "工艺路线未启用多级审批禁用";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //根据HInterID获取该单据的数据
                {
                    if (oBill.omodel.HBillStatus != 6)
@@ -1722,6 +1736,21 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //获取系统参数判断工艺路线是否启用多级审批禁用
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "N") //系统参数  æœªå¯ç”¨è‡ªåŠ¨å®¡æ ¸ 
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "工艺路线未启用多级审批禁用";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                //HInterID数据判断
                if (HInterID <= 0)
@@ -1791,7 +1820,20 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //获取系统参数判断工艺路线是否启用多级审批禁用
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "N") //系统参数  æœªå¯ç”¨è‡ªåŠ¨å®¡æ ¸ 
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "工艺路线未启用多级审批禁用";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                //HInterID数据判断
                if (HInterID <= 0)
@@ -2161,5 +2203,122 @@
        }
        #endregion

        #region å·¥è‰ºè·¯çº¿ å…³é—­å…¶å®ƒå•æ®
        [Route("Gy_Routing/CloseOther")]
        [HttpGet]
        public object CloseOther(int HInterID, string CurUserName)
        {
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //判断是否有关闭其它权限
                if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CloseOther", 1, false, CurUserName))
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "工艺路线无权限关闭其它单据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();//开始事务

                //判断单据是否存在
                DataSet ds;
                string sql = "select * from Gy_RoutingBillMain where HinterID = " + HInterID;
                ds = oCN.RunProcReturn(sql, "Gy_RoutingBillMain");
                if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                {
                    //if (!(ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != ""))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "单据未审核!不可以被启用为该物料的默认工艺路线!";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}
                }
                else
                {
                    objJsonResult.code = CodeConstant.FAIL;
                    objJsonResult.count = CountConstant.FAIL;
                    objJsonResult.Message = "单据不存在，检查该单据是否已经被删除!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //刷新默认工艺路线
                oCN.RunProc("exec h_p_Gy_RoutingBillClose " + HInterID + ",'" + CurUserName + "'");

                oCN.Commit();//提交事务
                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "关闭其它失败失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å¾…失效报表
        /// <summary>
        /// å¾…失效报表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_RoutingBill/getInvalidityReport")]
        [HttpGet]
        public object getInvalidityReport(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "待失效报表无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList  where å®šé¢ç±»åž‹ = '临时定额' and å¤±æ•ˆæ—¶é—´ BETWEEN NOW() - INTERVAL 15 DAY AND NOW() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
                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 = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                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;
            }
            return GetObjectJson(ds);
        }

        #endregion
    }
}

 WebAPI/Controllers/LMESController.cs

@@ -1210,7 +1210,7 @@
        #region å·¥è‰ºè·¯çº¿åˆ†é¡µåˆ—表
        [Route("Gy_RoutingBill/page")]
        [HttpGet]
        public json Gy_RoutingBillPage(string sWhere, string user, int page, int size)
        public object Gy_RoutingBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            json res = new json();
@@ -1256,7 +1256,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion
@@ -3559,7 +3559,23 @@
                        return objJsonResult;
                    }
                }
               

                //获取系统参数判断工艺路线是否启用多级审批禁用普通审批
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "Y") //系统参数  å¯ç”¨è‡ªåŠ¨å®¡æ ¸ 
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "工艺路线已启用多级审批普通审核禁用";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }



                if (string.IsNullOrWhiteSpace(HInterID))
                {

 WebAPI/Controllers/WebAPIController.cs

@@ -14217,7 +14217,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(" select * from h_v_Sc_ProcessExchangeBillList where 1=1 and æ—¥æœŸ>=DATEADD(MONTH,-2,GETDATE()) order by å•æ®å· desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
                    ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessExchangeBillList where 1=1  order by å•æ®å· desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
                }
                else
                {
@@ -14818,7 +14818,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

 WebAPI/Controllers/ÈËʹÜÀí/ÈËÔ±ÂÄÀú/HR_PersonnelResumeController.cs

New file
@@ -0,0 +1,85 @@
using DBUtility;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Models;
using System.Threading.Tasks;
using DLL;

namespace WebAPI.Controllers.人事管理.人员履历
{
    public class HR_PersonnelResumeController : ApiController
    {
     
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


        #region äººå‘˜å±¥åŽ†æŠ¥è¡¨

        /// <summary>
        /// äººå‘˜å±¥åŽ†æŠ¥è¡¨
        /// </summary>
        /// <returns></returns>
        [Route("HR_PersonnelResumeController/GetHR_PersonnelResumeList")]
        [HttpGet]
        public object GetHR_PersonnelResumeList(string sWhere)
        {
            try
            {

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

                string HNumber = dic["HNumber"].ToString();//职员代码
                string HName = dic["HName"].ToString();//职员

                ds = oCN.RunProcReturn("exec h_p_HR_PersonnelResumeReport '" + HNumber.ToString() + "','" + HName + "'", "h_p_HR_PersonnelResumeReport");
                List<object> columnNameList = new List<object>();
                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
                {
                    List<object> tableColumnList = new List<object>();

                    // æ·»åŠ åˆ—名
                    foreach (DataColumn col in table.Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
                    }

                    // å°†æ¯ä¸ªè¡¨çš„列名列表添加到总列名列表
                    columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
                }

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds;
                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/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -1191,8 +1191,12 @@
                string HProject = dic["HProject"].ToString();//项目号
                string HBatchWork = dic["HBatchWork"].ToString();//是否量产
                string HDivisionName = dic["HDivisionName"].ToString();//事业部
                string HMaterNumber = dic["HMaterNumber"].ToString();//物料代码
                string HMaterName = dic["HMaterName"].ToString();//物料名称
                string HBatchNo = dic["HBatchNo"].ToString();//批次号
                string HProjectNum = dic["HProjectNum"].ToString();//项目号

                ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_BadProductsReport");
                ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchNo + "','" + HProjectNum + "'", "h_p_QC_BadProductsReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1708,5 +1712,43 @@

        #endregion

        #region è´¨é‡æ¨¡å—    å…¨ç¨‹è´¨é‡è¿½æº¯ æ ¹æ®å…¨ç¨‹è¿½æº¯æŠ¥è¡¨ æ³• èŽ·å–物料+流转卡+设备+工序

        [Route("QC_CustomerAppealReport/Get_EquipICMOTechParamList")]
        [HttpGet]
        public object Get_EquipICMOTechParamList(string linterid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn(@"select a.HProcExchBillNo,g.HEquipFileNumber,g.HName è®¾å¤‡åç§°,b.HName ç‰©æ–™åç§°,h.HName å·¥åºåç§°  from SB_EquipICMOTechParamBillMain a left join Gy_Material b on a.HMaterID = b.HItemID
                left join Gy_Source e on a.HSourceID = e.HItemID left join Gy_EquipFileBillMain g on a.HEquipID = g.HInterID left join Gy_Process h on a.HProcID = h.HItemID", "SB_EquipICMOTechParamBillMain");
                //添加列名
                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/Controllers/¹¤×ʹÜÀí/Pay_ErrWorkTimesRequestBillController.cs

@@ -131,7 +131,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_GroupBalBillController.cs

@@ -102,6 +102,20 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //判断是否有查看全部班组的权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_AllQuery", 3, false, user))
                {
                    //如果没有这个权限
                    //根据用户对应班组的关系，过滤条件中增加只显示对应的班组
                    DataSet dsHitemID = oCn.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
                    string sqlGroupID = DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);
                    if (sqlGroupID == "" || sqlGroupID == null)//如果没有绑定班组则让他看不到所有
                    {
                        sqlGroupID = "and 1 = 2";
                    }
                    sqlGroupID = sqlGroupID.Replace("HitemID", "HGroupID");//替换sql语句中的HitemID
                    sWhere = sWhere + sqlGroupID;
                }
                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
@@ -133,7 +147,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion
@@ -410,6 +424,66 @@
        }
        #endregion

        #region å·¥èµ„结算单(集体) æ‰¹é‡å®¡æ ¸
        /// <summary>
        /// å®¡æ ¸/反审核工资结算单(集体)
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="Type">审核(1),反审核(2)</param>
        /// <param name="HMaker">审核人</param>
        /// <returns></returns>
        [Route("Pay_GroupBalBillController/CheckAll")]
        [HttpGet]
        public object CheckAll(string ids, int Type, string HMaker)
        {
            try
            {
                //处理字符串
                if (!string.IsNullOrEmpty(ids))
                {
                    long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
                    // å¤„理idArray...
                    oCn.BeginTran();
                    for (int i = 0; i < idArray.Length; i++)
                    {
                        objJsonResult = (json)GetPay_GroupBalBill_Check_Json(idArray[i], Type, HMaker);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            oCn.RollBack();
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }
                    }
                    oCn.Commit();
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择正确行";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工资结算单(个人)失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region å·¥èµ„结算单（集体） å…³é—­/反关闭
        /// <summary>
        /// å…³é—­/反关闭工资结算单（集体）

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_ProcPriceRequestBillController.cs

@@ -132,7 +132,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_SingleBalBillController.cs

@@ -103,6 +103,22 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //判断是否有查看全部班组的权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_AllQuery", 3, false, user))
                {
                    //如果没有这个权限
                    //根据用户对应班组的关系，过滤条件中增加只显示对应的班组
                    DataSet dsHitemID = oCn.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
                    string sqlGroupID = DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);
                    if(sqlGroupID == ""||sqlGroupID==null)//如果没有绑定班组则让他看不到所有
                    {
                        sqlGroupID = "and 1 = 2";
                    }
                    sqlGroupID = sqlGroupID.Replace("HitemID", "HGroupID");//替换sql语句中的HitemID
                    sWhere = sWhere + sqlGroupID;
                }


                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
@@ -134,7 +150,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion
@@ -411,6 +427,65 @@
        }
        #endregion

        #region å·¥èµ„结算单(个人) æ‰¹é‡å®¡æ ¸
        /// <summary>
        /// å®¡æ ¸/反审核工资结算单(个人)
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="Type">审核(1),反审核(2)</param>
        /// <param name="HMaker">审核人</param>
        /// <returns></returns>
        [Route("Pay_SingleBalBillController/CheckAll")]
        [HttpGet]
        public object CheckAll(string ids, int Type, string HMaker)
        {
            try
            {
                //处理字符串
                if (!string.IsNullOrEmpty(ids))
                {
                    long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
                    // å¤„理idArray...
                    oCn.BeginTran();
                    for (int i = 0; i < idArray.Length; i++)
                    {
                        objJsonResult = (json)GetPay_SingleBalBill_Check_Json(idArray[i], Type, HMaker);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            oCn.RollBack();
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }
                    }
                    oCn.Commit();
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择正确行";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                
                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工资结算单(个人)失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥èµ„结算单(个人) å…³é—­/反关闭
        /// <summary>
        /// å…³é—­/反关闭工资结算单(个人)

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs

@@ -133,7 +133,7 @@
                res.count = CountConstant.FAIL;
                res.Message = "Exception！" + e.ToString();
                res.data = null;
                return objJsonResult;
                return res;
            }
        }
        #endregion

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

@@ -91,22 +91,24 @@
                    {
                        ds = oCN.RunProcReturn
                     ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
                     ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID" +
                     ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID,a.HSourceID,s.HName HSourceName" +
                     ",a.HSourceBillNo,a.HSourceInterID,a.HSourceEntryID,a.HDatePlanQty,a.HDeptID,d.HName HDeptName,m.HUnitID,u.HName HUnitName" +
                     " from Sc_ICMOBillStatus_Tmp a " +
                     " left join Gy_Material m on a.HMaterID=m.HItemID " +
                     " left join Gy_Department d on a.HDeptID=d.HItemID " +
                     " left join Gy_Unit u on m.HUnitID=u.HItemID " +
                     " left join Gy_Source s on a.HSourceID=s.HItemID " +
                     " Where a.HInterID=" + HInterID + " and a.HBillType=" + HBillType, "Sc_ICMOBillStatus_Tmp");
                    }
                    else {
                        ds = oCN.RunProcReturn
                         ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
                         ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID,a.HSourceID,s.HName HSourceName" +
                         ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel,a.HICMOEntryID,a.HDeptID,d.HName HDeptName,m.HUnitID,u.HName HUnitName " +
                         " from Sc_ICMOBillStatus_Tmp a " +
                         " left join Gy_Material m on a.HMaterID=m.HItemID " +
                         " left join Gy_Department d on a.HDeptID=d.HItemID " +
                         " left join Gy_Unit u on m.HUnitID=u.HItemID " +
                         " left join Gy_Source s on a.HSourceID=s.HItemID " +
                         " Where a.HInterID=" + HInterID + " and a.HBillType=" + HBillType, "Sc_ICMOBillStatus_Tmp");
                    }
                 

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-10-15T08:44:32.6189434Z;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2024-10-22T02:33:10.1961964Z;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/15/2024 16:43:59</publishTime>
      <publishTime>10/23/2024 11:34:21</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/15/2024 16:43:59</publishTime>
      <publishTime>10/23/2024 11:34:21</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/15/2024 16:43:56</publishTime>
      <publishTime>10/23/2024 11:34:19</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/15/2024 16:43:56</publishTime>
      <publishTime>10/23/2024 11:34:19</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/15/2024 16:43:52</publishTime>
      <publishTime>10/23/2024 11:34:12</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/15/2024 16:43:52</publishTime>
      <publishTime>10/23/2024 11:34:12</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>10/15/2024 16:43:52</publishTime>
      <publishTime>10/23/2024 11:34:14</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/15/2024 16:43:52</publishTime>
      <publishTime>10/23/2024 11:34:14</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:11</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:11</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:12</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:12</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:12</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/15/2024 16:43:50</publishTime>
      <publishTime>10/23/2024 11:34:12</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/15/2024 16:41:50</publishTime>
      <publishTime>10/23/2024 11:32:01</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/15/2024 16:41:50</publishTime>
      <publishTime>10/23/2024 11:32:01</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>10/15/2024 16:41:55</publishTime>
      <publishTime>10/23/2024 11:32:07</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/15/2024 16:41:55</publishTime>
      <publishTime>10/23/2024 11:32:07</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/15/2024 16:44:29</publishTime>
      <publishTime>10/23/2024 11:34:53</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/15/2024 16:44:29</publishTime>
      <publishTime>10/23/2024 11:34:53</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>

 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user

@@ -5,173 +5,179 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-08-26T06:17:37.8502046Z;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
    <History>True|2024-10-22T08:25:12.9514711Z;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 08:33:48</publishTime>
      <publishTime>04/07/2020 16:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 09:49:04</publishTime>
      <publishTime>04/25/2023 17:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 12:50:30</publishTime>
      <publishTime>07/31/2024 20:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 10:07:52</publishTime>
      <publishTime>08/06/2024 18:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 03:24:18</publishTime>
      <publishTime>11/22/2022 11:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 11:43:22</publishTime>
      <publishTime>08/08/2024 19:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 12:25:56</publishTime>
      <publishTime>07/15/2024 20:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 13:46:08</publishTime>
      <publishTime>08/03/2022 21:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 02:36:58</publishTime>
      <publishTime>07/24/2024 10:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.pdb">
      <publishTime>02/22/2013 08:43:40</publishTime>
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/26/2024 14:16:33</publishTime>
      <publishTime>10/22/2024 16:24:57</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/26/2024 14:16:33</publishTime>
      <publishTime>10/22/2024 16:24:57</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/17/2020 21:32:28</publishTime>
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/26/2024 14:16:32</publishTime>
      <publishTime>10/22/2024 16:24:56</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/26/2024 14:16:32</publishTime>
      <publishTime>10/22/2024 16:24:56</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/26/2024 14:16:30</publishTime>
      <publishTime>10/22/2024 16:24:53</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/26/2024 14:16:30</publishTime>
      <publishTime>10/22/2024 16:24:53</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 05:17:26</publishTime>
      <publishTime>03/22/2022 13:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/18/2022 23:39:42</publishTime>
      <publishTime>03/19/2022 07:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 05:17:20</publishTime>
      <publishTime>03/22/2022 13:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/18/2022 23:39:48</publishTime>
      <publishTime>03/19/2022 07:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/08/2021 17:08:30</publishTime>
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/08/2021 17:08:30</publishTime>
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/08/2023 09:18:13</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/18/2015 17:02:50</publishTime>
      <publishTime>03/19/2015 01:02:50</publishTime>
    </File>
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Web.Infrastructure.dll">
      <publishTime>07/25/2012 11:48:56</publishTime>
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/26/2024 14:16:30</publishTime>
      <publishTime>10/22/2024 16:24:54</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/26/2024 14:16:30</publishTime>
      <publishTime>10/22/2024 16:24:54</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>09/05/2022 17:03:10</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 07:09:56</publishTime>
      <publishTime>03/08/2023 15:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/26/2024 14:16:28</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/26/2024 14:16:28</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/26/2024 14:16:29</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/26/2024 14:16:29</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/30/2012 22:22:50</publishTime>
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/26/2024 14:16:29</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/26/2024 14:16:29</publishTime>
      <publishTime>10/22/2024 16:24:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/22/2024 10:30:55</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/22/2024 10:30:55</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 10:01:28</publishTime>
      <publishTime>07/19/2017 18:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -195,25 +201,25 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 10:03:34</publishTime>
      <publishTime>08/19/2014 18:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/17/2019 16:24:34</publishTime>
      <publishTime>04/18/2019 00:24:34</publishTime>
    </File>
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Extensions.dll">
      <publishTime>02/19/2015 20:10:46</publishTime>
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 13:00:36</publishTime>
      <publishTime>11/28/2018 21:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/19/2015 20:10:46</publishTime>
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/18/2018 19:38:10</publishTime>
      <publishTime>09/19/2018 03:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -222,7 +228,7 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Cors.dll">
      <publishTime>11/28/2018 12:58:44</publishTime>
      <publishTime>11/28/2018 20:58:44</publishTime>
    </File>
    <File Include="bin/System.Web.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -237,37 +243,37 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.Helpers.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.Http.Cors.dll">
      <publishTime>11/28/2018 13:01:26</publishTime>
      <publishTime>11/28/2018 21:01:26</publishTime>
    </File>
    <File Include="bin/System.Web.Http.dll">
      <publishTime>11/28/2018 13:01:00</publishTime>
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>09/05/2022 17:03:08</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
      <publishTime>01/28/2015 12:02:18</publishTime>
    </File>
    <File Include="bin/System.Web.Optimization.dll">
      <publishTime>02/11/2014 15:26:04</publishTime>
      <publishTime>02/11/2014 23:26:04</publishTime>
    </File>
    <File Include="bin/System.Web.Razor.dll">
      <publishTime>01/28/2015 04:02:32</publishTime>
      <publishTime>01/28/2015 12:02:32</publishTime>
    </File>
    <File Include="bin/System.Web.Services.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Deployment.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Web.WebPages.Razor.dll">
      <publishTime>01/28/2015 04:04:30</publishTime>
      <publishTime>01/28/2015 12:04:30</publishTime>
    </File>
    <File Include="bin/System.Xml.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -276,217 +282,217 @@
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 02:43:40</publishTime>
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/26/2024 14:16:31</publishTime>
      <publishTime>10/22/2024 16:24:03</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/26/2024 14:16:31</publishTime>
      <publishTime>10/22/2024 16:24:03</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 11:18:48</publishTime>
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/26/2024 14:16:37</publishTime>
      <publishTime>10/22/2024 16:24:30</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/26/2024 14:16:37</publishTime>
      <publishTime>10/22/2024 16:24:30</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
      <publishTime>07/18/2013 01:03:52</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
      <publishTime>11/29/2018 13:26:02</publishTime>
      <publishTime>11/29/2018 21:26:02</publishTime>
    </File>
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 13:26:30</publishTime>
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>11/27/2023 09:14:13</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>09/05/2022 17:02:53</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>09/05/2022 17:02:53</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>09/05/2022 17:02:53</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>09/05/2022 17:03:02</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>09/05/2022 17:03:06</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>09/05/2022 17:03:07</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>02/08/2023 09:18:13</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>09/05/2022 17:03:07</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>09/05/2022 17:03:07</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>09/05/2022 17:03:07</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>09/05/2022 17:03:08</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>09/05/2022 17:03:08</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>01/10/2023 17:20:14</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>09/05/2022 17:03:09</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
      <publishTime>03/19/2022 07:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/24/2023 08:56:46</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>09/05/2022 17:03:09</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/15/2024 22:03:48</publishTime>
      <publishTime>09/19/2024 09:05:04</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>09/05/2022 17:03:10</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>09/05/2022 17:03:10</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>09/05/2022 17:03:11</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>01/24/2024 11:35:25</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/06/2024 08:56:50</publishTime>
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/26/2024 14:17:36</publishTime>
      <publishTime>10/15/2024 10:32:48</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj

@@ -445,6 +445,7 @@
    <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
    <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
    <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
    <Compile Include="Controllers\人事管理\人员履历\HR_PersonnelResumeController.cs" />
    <Compile Include="Controllers\仓存管理\Kf_MoveStockBillController.cs" />
    <Compile Include="Controllers\品质管理\质量月度目标单\QC_MonthTarGetBillController.cs" />
    <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />

 WebAPI/WebAPI.csproj.user

@@ -18,9 +18,9 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

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

Binary files differ

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

@@ -21,4 +21,3 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ