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