|
|
@@ -996,21 +996,21 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
string procsql = "";//PRO_PM_GetProductionDataPDA
|
|
|
|
|
|
//xuwei modify 2019-12-13 修正读取当前工序 是编辑还是插入
|
|
|
- //procsql = @"SELECT TP_PM_ProductionDataIn.ProductionDataID FROM TP_PM_ProductionDataIn where valueflag=1 and 1=1 and ProcedureID=" + searchEntity.ProcedureID + " and barcode='" + searchEntity.BarCode + "' order by TP_PM_ProductionDataIn.ProductionDataid desc";
|
|
|
- procsql = $@"
|
|
|
- SELECT
|
|
|
- TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID
|
|
|
- FROM
|
|
|
- TP_PM_PRODUCTIONDATAIN
|
|
|
- WHERE
|
|
|
- VALUEFLAG = 1
|
|
|
- AND 1 = 1
|
|
|
- AND PROCEDUREID = {searchEntity.ProcedureID}
|
|
|
- AND BARCODE = '{searchEntity.BarCode}'
|
|
|
- AND PRODUCTIONDATAID = ( SELECT MAX( PRODUCTIONDATAID ) FROM TP_PM_PRODUCTIONDATAIN WHERE BARCODE = '{searchEntity.BarCode}' )
|
|
|
- ORDER BY
|
|
|
- TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID DESC
|
|
|
- ";
|
|
|
+ procsql = @"SELECT TP_PM_ProductionDataIn.ProductionDataID FROM TP_PM_ProductionDataIn where valueflag=1 and 1=1 and ProcedureID=" + searchEntity.ProcedureID + " and barcode='" + searchEntity.BarCode + "' order by TP_PM_ProductionDataIn.ProductionDataid desc";
|
|
|
+ //procsql = $@"
|
|
|
+ // SELECT
|
|
|
+ // TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID
|
|
|
+ // FROM
|
|
|
+ // TP_PM_PRODUCTIONDATAIN
|
|
|
+ // WHERE
|
|
|
+ // VALUEFLAG = 1
|
|
|
+ // AND 1 = 1
|
|
|
+ // AND PROCEDUREID = {searchEntity.ProcedureID}
|
|
|
+ // AND BARCODE = '{searchEntity.BarCode}'
|
|
|
+ // AND PRODUCTIONDATAID = ( SELECT MAX( PRODUCTIONDATAID ) FROM TP_PM_PRODUCTIONDATAIN WHERE BARCODE = '{searchEntity.BarCode}' )
|
|
|
+ // ORDER BY
|
|
|
+ // TP_PM_PRODUCTIONDATAIN.PRODUCTIONDATAID DESC
|
|
|
+ //";
|
|
|
|
|
|
try
|
|
|
{
|
|
|
@@ -1801,28 +1801,32 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
{
|
|
|
return AddBarCodeMissingID;
|
|
|
}
|
|
|
- #endregion
|
|
|
- // 漏扫工序与检验工序不在一条路径上 modify by chenxy 2016-08-08 end
|
|
|
-
|
|
|
- //sqlString = "select TP_PC_Procedure.ProcedureID,TP_PC_Procedure.ProcedureCode,TP_PC_Procedure.ProcedureName,TP_PC_Procedure.NodeType from TP_PC_Procedure where ProcedureID=:procedureID";
|
|
|
- //paras = new OracleParameter[]{
|
|
|
- // new OracleParameter(":procedureID",OracleDbType.Int32,produceid,ParameterDirection.Input),
|
|
|
- // };
|
|
|
- //ds = oracleTrConn.GetSqlResultToDs(sqlString, paras);
|
|
|
- //int nodetype = Convert.ToInt32(ds.Tables[0].Rows[0]["NodeType"]);//获取当前工序的类型，为了判断如果成检设置重燃，未走重燃，直接包装，还有就是不记录以前工序的值
|
|
|
- //if ((produceid > missprocedureid) || (ReworkProcedureID > 0 && nodetype == 3) || (isrefire == 6))//3 为结束节点,6为重烧
|
|
|
- sqlString = "select 1 from TP_PM_ProductionDataIn where barcode=:barcode and ProcedureID=:ProcedureID and ValueFlag=1";
|
|
|
- paras = new OracleParameter[]{
|
|
|
- new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
|
|
|
- new OracleParameter(":ProcedureID",OracleDbType.Int32, produceid,ParameterDirection.Input),
|
|
|
- };
|
|
|
- ds = oracleTrConn.GetSqlResultToDs(sqlString, paras);
|
|
|
+ #endregion
|
|
|
+ // 漏扫工序与检验工序不在一条路径上 modify by chenxy 2016-08-08 end
|
|
|
+
|
|
|
+ //sqlString = "select TP_PC_Procedure.ProcedureID,TP_PC_Procedure.ProcedureCode,TP_PC_Procedure.ProcedureName,TP_PC_Procedure.NodeType from TP_PC_Procedure where ProcedureID=:procedureID";
|
|
|
+ //paras = new OracleParameter[]{
|
|
|
+ // new OracleParameter(":procedureID",OracleDbType.Int32,produceid,ParameterDirection.Input),
|
|
|
+ // };
|
|
|
+ //ds = oracleTrConn.GetSqlResultToDs(sqlString, paras);
|
|
|
+ //int nodetype = Convert.ToInt32(ds.Tables[0].Rows[0]["NodeType"]);//获取当前工序的类型，为了判断如果成检设置重燃，未走重燃，直接包装，还有就是不记录以前工序的值
|
|
|
+ //if ((produceid > missprocedureid) || (ReworkProcedureID > 0 && nodetype == 3) || (isrefire == 6))//3 为结束节点,6为重烧
|
|
|
+
|
|
|
+ // 前面已经判断过 校验工序在漏扫工序（应该是当前工序吧）后 by chenxy 2020-03-29 begin
|
|
|
+ //sqlString = "select 1 from TP_PM_ProductionDataIn where barcode=:barcode and ProcedureID=:ProcedureID and ValueFlag=1";
|
|
|
+ //paras = new OracleParameter[]{
|
|
|
+ // new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
|
|
|
+ // new OracleParameter(":ProcedureID",OracleDbType.Int32, produceid,ParameterDirection.Input),
|
|
|
+ // };
|
|
|
+ //ds = oracleTrConn.GetSqlResultToDs(sqlString, paras);
|
|
|
+
|
|
|
+ //// if (produceid > missprocedureid)
|
|
|
+ //if (ds != null && ds.Tables[0].Rows.Count == 0) // 未走过该工序
|
|
|
+ // 前面已经判断过 校验工序在漏扫工序（应该是当前工序吧）后 by chenxy 2020-03-29 end
|
|
|
|
|
|
- // if (produceid > missprocedureid)
|
|
|
- if (ds != null && ds.Tables[0].Rows.Count == 0) // 未走过该工序
|
|
|
- {
|
|
|
- #region 插入漏扫表,如果漏扫表里有相应的条码，不允许重复插入
|
|
|
- sqlString = @"select 1 from TP_PM_BarCodeMissing where barcode=:barcode and MissProcedureID=:MissProcedureID and ProcedureID=:ProcedureID";
|
|
|
+ {
|
|
|
+ #region 插入漏扫表,如果漏扫表里有相应的条码，不允许重复插入
|
|
|
+ sqlString = @"select missid from TP_PM_BarCodeMissing where barcode=:barcode and MissProcedureID=:MissProcedureID and ProcedureID=:ProcedureID";
|
|
|
paras = new OracleParameter[]{
|
|
|
new OracleParameter(":barcode",OracleDbType.Varchar2, barcode,ParameterDirection.Input),
|
|
|
new OracleParameter(":MissProcedureID",OracleDbType.Int32, missprocedureid,ParameterDirection.Input),
|
|
|
@@ -1944,14 +1948,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
new OracleParameter(":AccountID",OracleDbType.Int32, sUserInfo.AccountID,ParameterDirection.Input),
|
|
|
};
|
|
|
oracleTrConn.GetSqlResultToStr(sqlString, paras);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- #endregion
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
+ #endregion
|
|
|
+ }
|
|
|
+ }
|
|
|
else //不在产
|
|
|
{
|
|
|
#region 是否存在注浆产品
|
|
|
@@ -3510,7 +3510,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
try
|
|
|
{
|
|
|
con.Open();
|
|
|
- string sqlString = @"select
|
|
|
+ // hg5020 半检只定成型和干补的责任 by chenxy 2020-03-30
|
|
|
+ // and(TP_PM_ProductionDataIn.modeltype = 8 or(TP_PM_ProductionDataIn.modeltype = 5 and(exists(select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID = TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG = '0'))))
|
|
|
+ // and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0')))
|
|
|
+ string sqlString = @"select
|
|
|
TP_PM_ProductionDataIn.Barcode as BarCode,
|
|
|
TP_PM_ProductionDataIn.UserID,
|
|
|
TP_PM_ProductionDataIn.UserCode,
|
|
|
@@ -3523,9 +3526,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
--left join TP_PC_Procedure
|
|
|
--on TP_PM_ProductionDataIn.ProcedureID=TP_PC_Procedure.ProcedureID
|
|
|
where TP_PM_ProductionDataIn.BarCode=:BarCode and TP_PM_ProductionDataIn.valueflag = '1'
|
|
|
-and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0')))
|
|
|
---and (TP_PM_ProductionDataIn.modeltype=8 or (TP_PM_ProductionDataIn.modeltype = 5 and (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0'))))
|
|
|
-order by TP_PM_ProductionDataIn.ProductionDataID
|
|
|
+and (TP_PM_ProductionDataIn.modeltype=8 or (TP_PM_ProductionDataIn.modeltype = 5 and (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0'))))
|
|
|
+ order by TP_PM_ProductionDataIn.ProductionDataID
|
|
|
";
|
|
|
// 干补后 半检 不能选成型责任
|
|
|
OracleParameter[] paras = new OracleParameter[]{
|
chenxy