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

yusijie

2023-07-24 89e44d60763512c3d9130542554c6d2d07d6269a

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillListController.cs

@@ -23,6 +23,7 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        DAL.ClsGy_SOPBill oBill = new DAL.ClsGy_SOPBill();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        public DataGridView grdMain = new System.Windows.Forms.DataGridView();

@@ -251,6 +252,20 @@
            {
                ds = oCN.RunProcReturn(sWhere, "WindowPrint");

                //客户制定
                string sErr = "";
                if (oSystemParameter.ShowBill(ref sErr))
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "乔一")
                    {
                        if (ds.Tables[0].Columns.Count > 8) {
                            LogService.CustomWriteLog("单据号:"+ ds.Tables[0].Rows[0][7].ToString(),"CS"+ DateTime.Now.ToString("yyyyMMdd"));
                        }
                    }
                  
                }
               

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";