chenxy 5 lat temu
rodzic
commit
dd4c3aeea8

+ 1 - 1
DK.Basics/FlowSetting/Common/ItemManager.cs

@@ -21,7 +21,7 @@ namespace Dongke.IBOSS.Basics.FlowSetting
         /// <summary>
         /// 管理器编码
         /// </summary>
-        private string _managerCode = Guid.NewGuid().ToString();
+        private string _managerCode = Guid.NewGuid().ToString().ToUpper();
         /// <summary>
         /// 画板
         /// </summary>

+ 2 - 2
DK.Basics/FlowSetting/FlowBox.cs

@@ -1368,7 +1368,7 @@ namespace Dongke.IBOSS.Basics.FlowSetting
                 int nodetype = Convert.ToInt32(xmlNode.Attributes.Item(1).InnerText);
                 //itemCount = Math.Max(itemCount, index);
 
-                FlowNode node = new FlowNode(this._itemManager, index, Guid.NewGuid().ToString());
+                FlowNode node = new FlowNode(this._itemManager, index, Guid.NewGuid().ToString().ToUpper());
                 node.NodeImageType = nodetype;
                 node.Name = xnl.Item(0).InnerText;
                 string fontname = xnl.Item(1).InnerText;
@@ -1403,7 +1403,7 @@ namespace Dongke.IBOSS.Basics.FlowSetting
 
                 int index = Convert.ToInt32(xmlLine.Attributes.Item(0).InnerText);
                 int lineType = Convert.ToInt32(xmlLine.Attributes.Item(1).InnerText);
-                FlowLine line = new FlowLine(this._itemManager, ++itemCount, Guid.NewGuid().ToString());
+                FlowLine line = new FlowLine(this._itemManager, ++itemCount, Guid.NewGuid().ToString().ToUpper());
                 int x0 = Convert.ToInt32(xnl.Item(0).InnerText);
                 int y0 = Convert.ToInt32(xnl.Item(1).InnerText);
                 int x1 = Convert.ToInt32(xnl.Item(2).InnerText);

+ 1 - 1
DK.Basics/FlowSetting/Items/FlowItem.cs

@@ -80,7 +80,7 @@ namespace Dongke.IBOSS.Basics.FlowSetting
         {
             this._itemManager = manager;
             this._itemID = this._itemManager.NewItemID;
-            this._ItemCode = Guid.NewGuid().ToString();
+            this._ItemCode = Guid.NewGuid().ToString().ToUpper();
         }
 
         /// <summary>

+ 5 - 5
DK.Basics/InvoiceLayout/LayoutBox.cs

@@ -377,7 +377,7 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
                         //    _clipboardFormat =
                         //        DataFormats.GetFormat(typeof(LayoutItem).FullName
                         //                + "{"
-                        //                + Guid.NewGuid().ToString()
+                        //                + Guid.NewGuid().ToString().ToUpper()
                         //                + "}");
                         //}
                         tsmiAllSelect.Enabled = true;
@@ -1143,7 +1143,7 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
                     //_clipboardFormat =
                     //    DataFormats.GetFormat(typeof(LayoutItem).FullName
                     //                        + "{"
-                    //                        + Guid.NewGuid().ToString()
+                    //                        + Guid.NewGuid().ToString().ToUpper()
                     //                        + "}");
                 }
                 err_level = 2;
@@ -3089,7 +3089,7 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
                 //_clipboardFormat =
                 //    DataFormats.GetFormat(typeof(LayoutItem).FullName
                 //                        + "{"
-                //                        + Guid.NewGuid().ToString()
+                //                        + Guid.NewGuid().ToString().ToUpper()
                 //                        + "}");
             }
             _lastItemRF = RectangleF.Empty;
@@ -3150,7 +3150,7 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
             //    _clipboardFormat =
             //        DataFormats.GetFormat(typeof(LayoutItem).FullName
             //                            + "{"
-            //                            + Guid.NewGuid().ToString()
+            //                            + Guid.NewGuid().ToString().ToUpper()
             //                            + "}");
             //}
             tsmiPaste.Enabled = true;
@@ -3253,7 +3253,7 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
                 _clipboardFormat =
                     DataFormats.GetFormat(typeof(LayoutItem).FullName
                                         + "{"
-                                        + Guid.NewGuid().ToString()
+                                        + Guid.NewGuid().ToString().ToUpper()
                                         + "}");
             }
             return _clipboardFormat;

+ 2 - 2
DK.Client/PCModule/F_PC_0102_1_1.cs

@@ -174,7 +174,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					////         break;
 					////     }
 					//// }
-					//// detailInfo.MOULDCODE = Guid.NewGuid().ToString();
+					//// detailInfo.MOULDCODE = Guid.NewGuid().ToString().ToUpper();
 					//// detailInfo.GOODSID = Convert.ToInt32(this.dkGoods.GoodsID);
 					//// detailInfo.GOODSNAME = this.dkGoods.GoodsName;
 					//// detailInfo.GOODSCODE = this.dkGoods.GoodsCode;
@@ -210,7 +210,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					DataRow r = dtInfo.NewRow();
 					r["GroutingMouldCode"] = MOULDCODE;
 					r["MouldSource"] = "0";
-					r["MOULDCODE"] = Guid.NewGuid().ToString();
+					r["MOULDCODE"] = Guid.NewGuid().ToString().ToUpper();
 					r["GOODSID"] = scbGoods.SearchedPKMember;
 					r["GOODSNAME"] = scbGoods.SearchedItem["GOODSNAME"];
 					r["GOODSCODE"] = scbGoods.SearchedItem["GOODSCODE"];

+ 3 - 3
DK.Client/PCModule/F_PC_0103_1.cs

@@ -583,7 +583,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 				//    int GroutingMouldCodeNum = i + _mouldCount;
 				//    GroutingLineDetailEntity detailInfo = new GroutingLineDetailEntity();
 				//    detailInfo.GROUTINGMOULDCODE = this.txtGroutingLineCode.Text + "-" + (GroutingMouldCodeNum + 1).ToString().PadLeft(3, '0');
-				//    detailInfo.MOULDCODE = Guid.NewGuid().ToString();
+				//    detailInfo.MOULDCODE = Guid.NewGuid().ToString().ToUpper();
 				//    detailInfo.GOODSID = Convert.ToInt32(this.dkGoods.GoodsID);
 				//    detailInfo.GOODSNAME = this.dkGoods.GoodsName;
 				//    detailInfo.GOODSCODE = this.dkGoods.GoodsCode;
@@ -622,7 +622,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					//        break;
 					//    }
 					//}
-					//detailInfo.MOULDCODE = Guid.NewGuid().ToString();
+					//detailInfo.MOULDCODE = Guid.NewGuid().ToString().ToUpper();
 					//detailInfo.GOODSID = Convert.ToInt32(this.dkGoods.GoodsID);
 					//detailInfo.GOODSNAME = this.dkGoods.GoodsName;
 					//detailInfo.GOODSCODE = this.dkGoods.GoodsCode;
@@ -635,7 +635,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					DataRow r = dtInfo.NewRow();
 					r["GroutingMouldCode"] = MOULDCODE;
 					r["MouldSource"] = "0";
-					r["MOULDCODE"] = Guid.NewGuid().ToString();
+					r["MOULDCODE"] = Guid.NewGuid().ToString().ToUpper();
 					r["GOODSID"] = scbGoods.SearchedPKMember;
 					r["GOODSNAME"] = scbGoods.SearchedItem["GOODSNAME"];
 					r["GOODSCODE"] = scbGoods.SearchedItem["GOODSCODE"];

+ 2 - 2
DK.Client/PMModule/F_PM_0302.cs

@@ -434,7 +434,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                                     // 生产数据实体
                                     ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                                     procedureDataEntity.Barcode = dsCheckBarcode.Tables[0].Rows[0][Constant.BarCodeResultTableColumns.out_barcode.ToString()].ToString();// txtBarcode.Text.Trim(); // 产品条码
-                                    procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                                    procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                                     procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                                     procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                                     procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称
@@ -480,7 +480,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                             // 生产数据实体
                             ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                             procedureDataEntity.Barcode = txtBarcode.Text.Trim(); // 产品条码
-                            procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                            procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                             procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                             procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                             procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称

+ 2 - 2
DK.Client/PMModule/F_PM_0402.cs

@@ -370,7 +370,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                                     // 生产数据实体
                                     ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                                     procedureDataEntity.Barcode = txtBarcode.Text.Trim(); // 产品条码
-                                    procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                                    procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                                     procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                                     procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                                     procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称
@@ -441,7 +441,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                             // 生产数据实体
                             ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                             procedureDataEntity.Barcode = txtBarcode.Text.Trim(); // 产品条码
-                            procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                            procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                             procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                             procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                             procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称

+ 1 - 1
DK.Client/PMModule/F_PM_2002.cs

@@ -268,7 +268,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                                 // 生产数据实体
                                 ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                                 procedureDataEntity.Barcode = txtBarcode.Text.Trim(); // 产品条码
-                                procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                                procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                                 procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                                 procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                                 procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称

+ 1 - 1
DK.Client/PMModule/F_PM_2502.cs

@@ -268,7 +268,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                                 // 生产数据实体
                                 ProductionDataEntity procedureDataEntity = new ProductionDataEntity();
                                 procedureDataEntity.Barcode = txtBarcode.Text.Trim(); // 产品条码
-                                procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString();// 集中采集批次号
+                                procedureDataEntity.CentralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();// 集中采集批次号
                                 procedureDataEntity.ProductionLineID = this._procedureDataEntity.ProductionLineID;// 生产线ID
                                 procedureDataEntity.ProductionLineCode = this._procedureDataEntity.ProductionlineCode;// 生产编码
                                 procedureDataEntity.ProductionLineName = this._procedureDataEntity.ProductionlineName;// 生产名称

+ 3 - 3
DK.Service/CommonModuleLogic/CommonModuleLogic.cs

@@ -341,7 +341,7 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
             {
                 Directory.CreateDirectory(path);
             }
-			string filename = "/" + System.Guid.NewGuid().ToString() + Constant.SYSTEM_IMAGE_FORMAT;
+			string filename = "/" + System.Guid.NewGuid().ToString().ToUpper() + Constant.SYSTEM_IMAGE_FORMAT;
 			dbpath += filename;
 			path += filename;
             image.Save(path);
@@ -385,7 +385,7 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
                 {
                     Directory.CreateDirectory(newPath);
                 }
-				string filename = "/" + System.Guid.NewGuid().ToString() + Constant.SYSTEM_IMAGE_FORMAT;
+				string filename = "/" + System.Guid.NewGuid().ToString().ToUpper() + Constant.SYSTEM_IMAGE_FORMAT;
 				dbpath += filename;
 				newPath += filename;
 				File.Move(filepath, newPath);
@@ -545,7 +545,7 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
                 {
                     Directory.CreateDirectory(path);
                 }
-				string filename = "/" + System.Guid.NewGuid().ToString() + Constant.SYSTEM_IMAGE_FORMAT;
+				string filename = "/" + System.Guid.NewGuid().ToString().ToUpper() + Constant.SYSTEM_IMAGE_FORMAT;
 				dbpath += filename;
 				path += filename;
                 FileStream fs = new FileStream(path, FileMode.Create);

+ 1 - 1
DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs

@@ -188,7 +188,7 @@ namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
                 #endregion
 
                 #region 形成需要执行的SQL语句
-                requestEntity.SessionKey = Guid.NewGuid().ToString();
+                requestEntity.SessionKey = Guid.NewGuid().ToString().ToUpper();
                 string strSql = "PRO_SYS_DoLogin";
                 OracleParameter[] paras = new OracleParameter[] 
                 {

+ 10 - 10
DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs

@@ -1847,7 +1847,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     //正常或维修状态可以转为换模状态,并更新模具编号,注浆次数,开始使用日期,模具状态
                     if (detailEntity.MOULDSTATUS != 0)  //只要不是停用的,就要进行修改
                     {
-                        string newMouldCode = Guid.NewGuid().ToString();
+                        string newMouldCode = Guid.NewGuid().ToString().ToUpper();
                         //更新明细信息
                         sbSql.Clear();
                         sbSql.Append("update TP_PC_GroutingLineDetail");
@@ -1864,7 +1864,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         new OracleParameter(":BeginUsedDate",OracleDbType.NVarchar2,
                             accountDate,ParameterDirection.Input),
                         new OracleParameter(":MouldCode",OracleDbType.NVarchar2,
-                            Guid.NewGuid().ToString(),ParameterDirection.Input),
+                            Guid.NewGuid().ToString().ToUpper(),ParameterDirection.Input),
                         new OracleParameter(":UpdateUserID",OracleDbType.Int32,
                             user.UserID,ParameterDirection.Input),
                         new OracleParameter(":GroutingLineDetailID",OracleDbType.Int32,
@@ -2565,7 +2565,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     int detailId = Convert.ToInt32(oracleTrConn.GetSqlResultToStr(sbSql.ToString()));
                     sbSql.Clear();
                     //插入成型线明细信息
-                    string NewMouldCode = Guid.NewGuid().ToString();
+                    string NewMouldCode = Guid.NewGuid().ToString().ToUpper();
                     sbSql.Append("Insert into TP_PC_GroutingLineDetail");
                     sbSql.Append("(GroutingLineDetailID,GroutingLineID,GroutingMouldCode,MouldCode,GoodsID,GroutingCount,");
                     sbSql.Append("GMouldStatus,BeginUsedDate,Remarks,AccountID,ValueFlag,CreateTime,");
@@ -4386,10 +4386,10 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     if (dtGroutingLineDetail.Rows[i]["MouldID"] + "" == "")
                     {
                         dtGroutingLineDetail.Rows[i]["MouldSource"] = "0";
-                        dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString();
+                        dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString().ToUpper();
                     }
                     object groutingCount = dtGroutingLineDetail.Rows[i]["GroutingCount"];
-                    //string guid = System.Guid.NewGuid().ToString();
+                    //string guid = System.Guid.NewGuid().ToString().ToUpper();
                     sbSql.Clear();
                     sbSql.Append("insert into TP_PC_GroutingLineDetail");
                     sbSql.Append("(");
@@ -5045,9 +5045,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     GroutingLineDetailID = Convert.ToInt32(oracleTrConn.GetSqlResultToStr(sbSql.ToString()));
                     if (dtGroutingLineDetail.Rows[i]["MouldCode"] + "" == "")
                     {
-                        dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString();
+                        dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString().ToUpper();
                     }
-                    //string guid = System.Guid.NewGuid().ToString();
+                    //string guid = System.Guid.NewGuid().ToString().ToUpper();
                     sbSql.Clear();
                     sbSql.Append("insert into TP_PC_GroutingLineDetail");
                     sbSql.Append("(");
@@ -5737,9 +5737,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         GroutingLineDetailID = Convert.ToInt32(oracleTrConn.GetSqlResultToStr(sbSql.ToString()));
                         if (dtGroutingLineDetail.Rows[i]["MouldCode"] + "" == "")
                         {
-                            dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString();
+                            dtGroutingLineDetail.Rows[i]["MouldCode"] = System.Guid.NewGuid().ToString().ToUpper();
                         }
-                        //string guid = System.Guid.NewGuid().ToString();
+                        //string guid = System.Guid.NewGuid().ToString().ToUpper();
                         sbSql.Clear();
                         sbSql.Append("insert into TP_PC_GroutingLineDetail");
                         sbSql.Append("(");
@@ -7137,7 +7137,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 
                         if (detailInfo["MouldID"] + "" == "" && detailInfo["MouldCode"] + "" == "")
                         {
-                            detailInfo["MouldCode"] = System.Guid.NewGuid().ToString();
+                            detailInfo["MouldCode"] = System.Guid.NewGuid().ToString().ToUpper();
                         }
 
                         sbSql.Clear();

+ 1 - 1
DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -505,7 +505,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 {
                     Directory.CreateDirectory(Constant.SYSTEM_TEMP_PATH);
                 }
-                string path = Constant.SYSTEM_TEMP_PATH + "/" + System.Guid.NewGuid().ToString() + Constant.SYSTEM_IMAGE_FORMAT;
+                string path = Constant.SYSTEM_TEMP_PATH + "/" + System.Guid.NewGuid().ToString().ToUpper() + Constant.SYSTEM_IMAGE_FORMAT;
                 Image img = Bitmap.FromStream(mageStream);
                 img.Save(System.AppDomain.CurrentDomain.BaseDirectory + path);
                 return path;

+ 23 - 23
DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -695,7 +695,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
                 // 条码信息
                 foreach (DataRow barcodeRow in barcodeTable.Rows)
@@ -1163,9 +1163,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 // 生产工号Name
                 string workUserName = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车批次号
-                string kilnCarBatchNo = System.Guid.NewGuid().ToString();
+                string kilnCarBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车状态
                 string kilnCarStatus = string.Empty;
                 //////////////////////////////////////////////////
@@ -1577,9 +1577,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 // 生产工号Name
                 string workUserName = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车批次号
-                string kilnCarBatchNo = System.Guid.NewGuid().ToString();
+                string kilnCarBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车状态
                 string kilnCarStatus = string.Empty;
                 //////////////////////////////////////////////////
@@ -1911,9 +1911,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 // 生产工号Name
                 string workUserName = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车批次号
-                string kilnCarBatchNo = System.Guid.NewGuid().ToString();
+                string kilnCarBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车状态
                 string kilnCarStatus = string.Empty;
 
@@ -2190,10 +2190,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 // 生产工号Name
                 string workUserName = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
                 // 窑车批次号
-                string kilnCarBatchNo = null;//System.Guid.NewGuid().ToString();
+                string kilnCarBatchNo = null;//System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车状态
                 string kilnCarStatus = string.Empty;
                 DataView dv = barcodeTable.DefaultView;
@@ -2500,11 +2500,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 // 生产工号Name
                 string workUserName = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车Code
                 string kilnCarCode = barcodeTable.Rows[0]["kilnCarCode"].ToString();
                 // 窑车批次号
-                string kilnCarBatchNo = System.Guid.NewGuid().ToString();
+                string kilnCarBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 窑车状态
                 string kilnCarStatus = string.Empty;
                 #region 校验窑车是否可装车
@@ -3021,7 +3021,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             else
             {
                 // 自动生成窑车烧成批次号
-                //return System.Guid.NewGuid().ToString();
+                //return System.Guid.NewGuid().ToString().ToUpper();
                 return GetFiredKilnCarBatchNo(oracleTrConn, kilnCarID);
             }
         }
@@ -6743,7 +6743,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             // 获得账务日期
             DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
             // 本批采集的批次号
-            string centralizedBatchNo = System.Guid.NewGuid().ToString();
+            string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
             #region 查询产品分级
             string sqlGoodsLevel = "select GoodsLevelID,GoodsLevelTypeID from TP_MST_GoodsLevel where AccountID=:accountID and ValueFlag=1";
             DataTable goodsLevelTable = oracleTrConn.GetSqlResultToDt(sqlGoodsLevel, new OracleParameter[] { new OracleParameter(":accountID", sUserInfo.AccountID) });
@@ -7154,7 +7154,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
         //    // 获得账务日期
         //    DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
         //    // 本批采集的批次号
-        //    string centralizedBatchNo = System.Guid.NewGuid().ToString();
+        //    string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
         //    foreach (ProductionDataEntity productionData in productionDataEntitys)
         //    {
         //        if (string.IsNullOrEmpty(productionData.Barcode))
@@ -7456,7 +7456,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             // 获得账务日期
             DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
             // 本批采集的批次号
-            string centralizedBatchNo = System.Guid.NewGuid().ToString();
+            string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
             string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
             #region 查询产品分级
             string sqlGoodsLevel = "select GoodsLevelID,GoodsLevelTypeID from TP_MST_GoodsLevel where AccountID=:accountID and ValueFlag=1";
@@ -9363,7 +9363,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             // 获得账务日期
             DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
             // 本批采集的批次号
-            string centralizedBatchNo = System.Guid.NewGuid().ToString();
+            string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
             string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
             foreach (ProductionDataEntity productionData in productionDataEntitys)
             {
@@ -10497,7 +10497,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             // 获得账务日期
             DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
             // 本批采集的批次号
-            string centralizedBatchNo = System.Guid.NewGuid().ToString();
+            string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
             string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
             foreach (ProductionDataEntity productionData in productionDataEntitys)
             {
@@ -10954,7 +10954,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 条码信息
                 string logoName_Temp = "";
                 string logoCode_Temp = "";
@@ -13796,7 +13796,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
                 // 条码信息
                 foreach (DataRow barcodeRow in barcodeTable.Rows)
@@ -14181,7 +14181,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 string finishedloadbatchno = DateTime.Now.ToString("yyMMddHHmmss-") + centralizedBatchNo;
                 // 条码信息
                 foreach (DataRow barcodeRow in barcodeTable.Rows)
@@ -18287,7 +18287,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 条码
                 string barcode = entity.BarCode;
                 if (string.IsNullOrEmpty(barcode))
@@ -21626,7 +21626,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 // 本批交接的批次号
 
                 #region 判断订单是否有明细
-                string fhBatchNo = System.Guid.NewGuid().ToString();
+                string fhBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 DataTable dtMaterialcode = null;
 
                 sql = "SELECT COUNT(1) AS detailcount\n" +
@@ -23279,7 +23279,7 @@ updateuserid=:updateuserid where barcode=:barcode";
                 DateTime accountDate = CommonModuleLogic.CommonModuleLogic.GetAccountDate(oracleTrConn, sUserInfo);
                 string errMsg = string.Empty;
                 // 本批采集的批次号
-                string centralizedBatchNo = System.Guid.NewGuid().ToString();
+                string centralizedBatchNo = System.Guid.NewGuid().ToString().ToUpper();
                 // 条码信息
                 string logoName_Temp = "";
                 string logoCode_Temp = "";

+ 3 - 3
DK.Service/PMModuleService/PMModuleLogic.cs

@@ -6745,7 +6745,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
             {
                 conn = ClsDbFactory.CreateDBTransaction(Basics.DataAccess.DataBaseType.ORACLE, DataManager.ConnectionString);
 
-                string suspendBatchNo = Guid.NewGuid().ToString();
+                string suspendBatchNo = Guid.NewGuid().ToString().ToUpper();
 
                 string sqlDelete = "DELETE FROM TP_PM_ProductSuspend ps\n" +
                 " WHERE ps.groutingdailydetailid = :groutingdailydetailid\n" +
@@ -6935,7 +6935,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
             {
                 conn = ClsDbFactory.CreateDBTransaction(Basics.DataAccess.DataBaseType.ORACLE, DataManager.ConnectionString);
 
-                string suspendBatchNo = Guid.NewGuid().ToString();
+                string suspendBatchNo = Guid.NewGuid().ToString().ToUpper();
 
                 string sqlDelete = "DELETE FROM TP_PM_ProductSuspend ps\n" +
                 " WHERE ps.groutingdailydetailid = :groutingdailydetailid\n" +
@@ -9432,7 +9432,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 dataAccess.Open(true);
 
                 DataTable data = cre.Data.Tables[0];
-                string CENTRALIZEDBATCHNO = System.Guid.NewGuid().ToString();
+                string CENTRALIZEDBATCHNO = System.Guid.NewGuid().ToString().ToUpper();
 
                 string sqlString = "\n" +
                 "insert into tp_pm_productiondatain\n" +

+ 1 - 1
DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -45,7 +45,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				DataSet customer = new DataSet();
 				//int readLock = LockLicenseHandle.ReadLisenceFile(requestEntity.LisenceFilePath, ref customer);
 				#region 形成需要执行的SQL语句
-				requestEntity.SessionKey = Guid.NewGuid().ToString();
+				requestEntity.SessionKey = Guid.NewGuid().ToString().ToUpper();
 				string strSql = "PRO_SYS_DoLogin";
 				OracleParameter[] paras = new OracleParameter[]
 				{