Merge branch 'master' of http://git.dongkesoft.com:9001/mes/hg5020

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -6101,6 +6101,83 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 #endregion
 
                 #region 插入生产数据
+                sqlString =
+                "  SELECT BARCODE,\n" +
+                "         CENTRALIZEDBATCHNO,\n" +
+                "         PRODUCTIONLINEID,\n" +
+                "         PRODUCTIONLINECODE,\n" +
+                "         PRODUCTIONLINENAME,\n" +
+                "         PROCEDUREID,\n" +
+                "         PROCEDURECODE,\n" +
+                "         PROCEDURENAME,\n" +
+                "         PROCEDUREMODEL,\n" +
+                "         MODELTYPE,\n" +
+                "         PIECETYPE,\n" +
+                "         ISREWORKED,\n" +
+                "         NODETYPE,\n" +
+                "         ISPUBLICBODY,\n" +
+                "         ISREFIRE,\n" +
+                "         ORGANIZATIONID,\n" +
+                "         GOODSID,\n" +
+                "         GOODSCODE,\n" +
+                "         GOODSNAME,\n" +
+                "         KILNID,\n" +
+                "         KILNCODE,\n" +
+                "         KILNNAME,\n" +
+                "         KILNCARID,\n" +
+                "         KILNCARCODE,\n" +
+                "         KILNCARNAME,\n" +
+                "         KILNCARBATCHNO,\n" +
+                "         KILNCARPOSITION,\n" +
+                "         REWORKPROCEDUREID,\n" +
+                "         REWORKPROCEDURECODE,\n" +
+                "         REWORKPROCEDURENAME,\n" +
+                "         REMARKS,\n" +
+                "         ACCOUNTDATE,\n" +
+                "         SETTLEMENTFLAG,\n" +
+                "         ACCOUNTID,\n" +
+                "         CREATETIME,\n" +
+                "         UPDATETIME,\n" +
+                "         GOODSLEVELID,\n" +
+                "         GOODSLEVELTYPEID,\n" +
+                "         GROUTINGDATE,\n" +
+                "         GROUTINGMOULDCODE,\n" +
+                "         MOULDCODE,\n" +
+                "         GROUTINGUSERID,\n" +
+                "         GROUTINGUSERCODE,\n" +
+                "         GROUTINGNUM,\n" +
+                "         GROUTINGDAILYID,\n" +
+                "         GROUTINGDAILYDETAILID,\n" +
+                "         GROUTINGLINEID,\n" +
+                "         GROUTINGLINECODE,\n" +
+                "         GROUTINGLINENAME,\n" +
+                "         GMOULDTYPEID,\n" +
+                "         CANMANYTIMES,\n" +
+                "         GROUTINGLINEDETAILID,\n" +
+                "         SPECIALREPAIRFLAG,\n" +
+                "         CLASSESSETTINGID,\n" +
+                "         LOGOID,\n" +
+                "         BACKOUTTIME,\n" +
+                "         BACKOUTUSERID,\n" +
+                "         BACKOUTUSERCODE,\n" +
+                "         CHECKTIME\n" +
+                "    FROM TP_PM_PRODUCTIONDATA\n" +
+                "   WHERE VALUEFLAG = '1'\n" +
+                "     AND PRODUCTIONDATAID = :PRODUCTIONDATAID";
+                paras = new OracleParameter[]
+                {
+                    new OracleParameter(":PRODUCTIONDATAID", OracleDbType.Int32, productionDataEntity.ProductionDataID,ParameterDirection.Input)
+                };
+                DataTable data = oracleTrConn.GetSqlResultToDt(sqlString, paras);
+                if (data == null || data.Rows.Count == 0)
+                {
+                    errMsg = "无成检数据";
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.Message = errMsg;
+                    return sre;
+                }
+                #region
+                /*
                 sqlString = "INSERT INTO TP_PM_PRODUCTIONDATA(\n" +
                             "        PRODUCTIONDATAID,\n" +
                             "        BARCODE,\n" +
@@ -6145,7 +6222,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                             "        CREATEUSERID,\n" +
                             "        UPDATETIME,\n" +
                             "        UPDATEUSERID,\n" +
-                            "        OPTIMESTAMP,\n" +
+                            //"        OPTIMESTAMP,\n" +
                             "        GOODSLEVELID,\n" +
                             "        GOODSLEVELTYPEID,\n" +
                             "        GROUTINGDATE,\n" +
@@ -6213,7 +6290,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                             "         :CREATEUSERID,\n" +
                             "         UPDATETIME,\n" +
                             "         :UPDATEUSERID,\n" +
-                            "         OPTIMESTAMP,\n" +
+                            //"         OPTIMESTAMP,\n" +
                             "         GOODSLEVELID,\n" +
                             "         GOODSLEVELTYPEID,\n" +
                             "         GROUTINGDATE,\n" +
@@ -6251,8 +6328,216 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                     new OracleParameter(":CREATEUSERID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
                     new OracleParameter(":UPDATEUSERID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
                     new OracleParameter(":PRODUCTIONDATAID",OracleDbType.Int32, productionDataEntity.ProductionDataID,ParameterDirection.Input)
+                };*/
+                #endregion
+                sqlString = "INSERT INTO TP_PM_PRODUCTIONDATA(\n" +
+                            "        PRODUCTIONDATAID,\n" +
+                            "        BARCODE,\n" +
+                            "        CENTRALIZEDBATCHNO,\n" +
+                            "        PRODUCTIONLINEID,\n" +
+                            "        PRODUCTIONLINECODE,\n" +
+                            "        PRODUCTIONLINENAME,\n" +
+                            "        PROCEDUREID,\n" +
+                            "        PROCEDURECODE,\n" +
+                            "        PROCEDURENAME,\n" +
+                            "        PROCEDUREMODEL,\n" +
+                            "        MODELTYPE,\n" +
+                            "        PIECETYPE,\n" +
+                            "        ISREWORKED,\n" +
+                            "        NODETYPE,\n" +
+                            "        ISPUBLICBODY,\n" +
+                            "        ISREFIRE,\n" +
+                            "        ORGANIZATIONID,\n" +
+                            "        GOODSID,\n" +
+                            "        GOODSCODE,\n" +
+                            "        GOODSNAME,\n" +
+                            "        USERID,\n" +
+                            "        USERCODE,\n" +
+                            "        USERNAME,\n" +
+                            "        KILNID,\n" +
+                            "        KILNCODE,\n" +
+                            "        KILNNAME,\n" +
+                            "        KILNCARID,\n" +
+                            "        KILNCARCODE,\n" +
+                            "        KILNCARNAME,\n" +
+                            "        KILNCARBATCHNO,\n" +
+                            "        KILNCARPOSITION,\n" +
+                            "        REWORKPROCEDUREID,\n" +
+                            "        REWORKPROCEDURECODE,\n" +
+                            "        REWORKPROCEDURENAME,\n" +
+                            "        REMARKS,\n" +
+                            "        ACCOUNTDATE,\n" +
+                            "        SETTLEMENTFLAG,\n" +
+                            "        ACCOUNTID,\n" +
+                            "        VALUEFLAG,\n" +
+                            "        CREATETIME,\n" +
+                            "        CREATEUSERID,\n" +
+                            "        UPDATETIME,\n" +
+                            "        UPDATEUSERID,\n" +
+                            //"        OPTIMESTAMP,\n" +
+                            "        GOODSLEVELID,\n" +
+                            "        GOODSLEVELTYPEID,\n" +
+                            "        GROUTINGDATE,\n" +
+                            "        GROUTINGMOULDCODE,\n" +
+                            "        MOULDCODE,\n" +
+                            "        GROUTINGUSERID,\n" +
+                            "        GROUTINGUSERCODE,\n" +
+                            "        GROUTINGNUM,\n" +
+                            "        GROUTINGDAILYID,\n" +
+                            "        GROUTINGDAILYDETAILID,\n" +
+                            "        GROUTINGLINEID,\n" +
+                            "        GROUTINGLINECODE,\n" +
+                            "        GROUTINGLINENAME,\n" +
+                            "        GMOULDTYPEID,\n" +
+                            "        CANMANYTIMES,\n" +
+                            "        GROUTINGLINEDETAILID,\n" +
+                            "        SPECIALREPAIRFLAG,\n" +
+                            "        CLASSESSETTINGID,\n" +
+                            "        LOGOID,\n" +
+                            "        BACKOUTTIME,\n" +
+                            "        BACKOUTUSERID,\n" +
+                            "        BACKOUTUSERCODE,\n" +
+                            "        CHECKTIME,\n" +
+                            "        TAMPERTIME)\n" +
+                            "  VALUES( :NEWPRODUCTIONDATAID,\n" +
+                            "         :BARCODE,\n" +
+                            "         :CENTRALIZEDBATCHNO,\n" +
+                            "         :PRODUCTIONLINEID,\n" +
+                            "         :PRODUCTIONLINECODE,\n" +
+                            "         :PRODUCTIONLINENAME,\n" +
+                            "         :PROCEDUREID,\n" +
+                            "         :PROCEDURECODE,\n" +
+                            "         :PROCEDURENAME,\n" +
+                            "         :PROCEDUREMODEL,\n" +
+                            "         :MODELTYPE,\n" +
+                            "         :PIECETYPE,\n" +
+                            "         :ISREWORKED,\n" +
+                            "         :NODETYPE,\n" +
+                            "         :ISPUBLICBODY,\n" +
+                            "         :ISREFIRE,\n" +
+                            "         :ORGANIZATIONID,\n" +
+                            "         :GOODSID,\n" +
+                            "         :GOODSCODE,\n" +
+                            "         :GOODSNAME,\n" +
+                            "         :USERID,\n" +
+                            "         :USERCODE,\n" +
+                            "         :USERNAME,\n" +
+                            "         :KILNID,\n" +
+                            "         :KILNCODE,\n" +
+                            "         :KILNNAME,\n" +
+                            "         :KILNCARID,\n" +
+                            "         :KILNCARCODE,\n" +
+                            "         :KILNCARNAME,\n" +
+                            "         :KILNCARBATCHNO,\n" +
+                            "         :KILNCARPOSITION,\n" +
+                            "         :REWORKPROCEDUREID,\n" +
+                            "         :REWORKPROCEDURECODE,\n" +
+                            "         :REWORKPROCEDURENAME,\n" +
+                            "         :REMARKS,\n" +
+                            "         :ACCOUNTDATE,\n" +
+                            "         :SETTLEMENTFLAG,\n" +
+                            "         :ACCOUNTID,\n" +
+                            "         '1',\n" +
+                            "         :CREATETIME,\n" +
+                            "         :CREATEUSERID,\n" +
+                            "         :UPDATETIME,\n" +
+                            "         :UPDATEUSERID,\n" +
+                            //"         OPTIMESTAMP,\n" +
+                            "         :GOODSLEVELID,\n" +
+                            "         :GOODSLEVELTYPEID,\n" +
+                            "         :GROUTINGDATE,\n" +
+                            "         :GROUTINGMOULDCODE,\n" +
+                            "         :MOULDCODE,\n" +
+                            "         :GROUTINGUSERID,\n" +
+                            "         :GROUTINGUSERCODE,\n" +
+                            "         :GROUTINGNUM,\n" +
+                            "         :GROUTINGDAILYID,\n" +
+                            "         :GROUTINGDAILYDETAILID,\n" +
+                            "         :GROUTINGLINEID,\n" +
+                            "         :GROUTINGLINECODE,\n" +
+                            "         :GROUTINGLINENAME,\n" +
+                            "         :GMOULDTYPEID,\n" +
+                            "         :CANMANYTIMES,\n" +
+                            "         :GROUTINGLINEDETAILID,\n" +
+                            "         :SPECIALREPAIRFLAG,\n" +
+                            "         :CLASSESSETTINGID,\n" +
+                            "         :LOGOID,\n" +
+                            "         :BACKOUTTIME,\n" +
+                            "         :BACKOUTUSERID,\n" +
+                            "         :BACKOUTUSERCODE,\n" +
+                            "         :CHECKTIME,\n" +
+                            "         SYSDATE)\n";
+                DataRow row = data.Rows[0];
+                paras = new OracleParameter[]
+                {
+                    new OracleParameter(":NEWPRODUCTIONDATAID",OracleDbType.Int32, newProductionDataID,ParameterDirection.Input),
+                    new OracleParameter(":USERID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
+                    new OracleParameter(":USERCODE",OracleDbType.Varchar2, sUserInfo.UserCode,ParameterDirection.Input),
+                    new OracleParameter(":USERNAME",OracleDbType.Varchar2, sUserInfo.UserName,ParameterDirection.Input),
+                    new OracleParameter(":CREATEUSERID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
+                    new OracleParameter(":UPDATEUSERID",OracleDbType.Int32, sUserInfo.UserID,ParameterDirection.Input),
+                    //new OracleParameter(":PRODUCTIONDATAID",OracleDbType.Int32, productionDataEntity.ProductionDataID,ParameterDirection.Input)
+                    
+                    new OracleParameter(":BARCODE",OracleDbType.NVarchar2, row["BARCODE"],ParameterDirection.Input),
+                    new OracleParameter(":CENTRALIZEDBATCHNO",OracleDbType.Varchar2, row["CENTRALIZEDBATCHNO"],ParameterDirection.Input),
+                    new OracleParameter(":PRODUCTIONLINEID",OracleDbType.Int32, row["PRODUCTIONLINEID"],ParameterDirection.Input),
+                    new OracleParameter(":PRODUCTIONLINECODE",OracleDbType.NVarchar2, row["PRODUCTIONLINECODE"],ParameterDirection.Input),
+                    new OracleParameter(":PRODUCTIONLINENAME",OracleDbType.NVarchar2, row["PRODUCTIONLINENAME"],ParameterDirection.Input),
+                    new OracleParameter(":PROCEDUREID",OracleDbType.Int32, row["PROCEDUREID"],ParameterDirection.Input),
+                    new OracleParameter(":PROCEDURECODE",OracleDbType.NVarchar2, row["PROCEDURECODE"],ParameterDirection.Input),
+                    new OracleParameter(":PROCEDURENAME",OracleDbType.NVarchar2, row["PROCEDURENAME"],ParameterDirection.Input),
+                    new OracleParameter(":PROCEDUREMODEL",OracleDbType.Char, row["PROCEDUREMODEL"],ParameterDirection.Input),
+                    new OracleParameter(":MODELTYPE",OracleDbType.Int32, row["MODELTYPE"],ParameterDirection.Input),
+                    new OracleParameter(":PIECETYPE",OracleDbType.Char, row["PIECETYPE"],ParameterDirection.Input),
+                    new OracleParameter(":ISREWORKED",OracleDbType.Char, row["ISREWORKED"],ParameterDirection.Input),
+                    new OracleParameter(":NODETYPE",OracleDbType.Char, row["NODETYPE"],ParameterDirection.Input),
+                    new OracleParameter(":ISPUBLICBODY",OracleDbType.Char, row["ISPUBLICBODY"],ParameterDirection.Input),
+                    new OracleParameter(":ISREFIRE",OracleDbType.Char, row["ISREFIRE"],ParameterDirection.Input),
+                    new OracleParameter(":ORGANIZATIONID",OracleDbType.Int32, row["ORGANIZATIONID"],ParameterDirection.Input),
+                    new OracleParameter(":GOODSID",OracleDbType.Int32, row["GOODSID"],ParameterDirection.Input),
+                    new OracleParameter(":GOODSCODE",OracleDbType.NVarchar2, row["GOODSCODE"],ParameterDirection.Input),
+                    new OracleParameter(":GOODSNAME",OracleDbType.NVarchar2, row["GOODSNAME"],ParameterDirection.Input),
+                    new OracleParameter(":KILNID",OracleDbType.Int32, row["KILNID"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCODE",OracleDbType.NVarchar2, row["KILNCODE"],ParameterDirection.Input),
+                    new OracleParameter(":KILNNAME",OracleDbType.NVarchar2, row["KILNNAME"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCARID",OracleDbType.Int32, row["KILNCARID"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCARCODE",OracleDbType.NVarchar2, row["KILNCARCODE"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCARNAME",OracleDbType.NVarchar2, row["KILNCARNAME"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCARBATCHNO",OracleDbType.NVarchar2, row["KILNCARBATCHNO"],ParameterDirection.Input),
+                    new OracleParameter(":KILNCARPOSITION",OracleDbType.Int32, row["KILNCARPOSITION"],ParameterDirection.Input),
+                    new OracleParameter(":REWORKPROCEDUREID",OracleDbType.Int32, row["REWORKPROCEDUREID"],ParameterDirection.Input),
+                    new OracleParameter(":REWORKPROCEDURECODE",OracleDbType.NVarchar2, row["REWORKPROCEDURECODE"],ParameterDirection.Input),
+                    new OracleParameter(":REWORKPROCEDURENAME",OracleDbType.NVarchar2, row["REWORKPROCEDURENAME"],ParameterDirection.Input),
+                    new OracleParameter(":REMARKS",OracleDbType.NVarchar2, row["REMARKS"],ParameterDirection.Input),
+                    new OracleParameter(":ACCOUNTDATE",OracleDbType.Date, row["ACCOUNTDATE"],ParameterDirection.Input),
+                    new OracleParameter(":SETTLEMENTFLAG",OracleDbType.Char, row["SETTLEMENTFLAG"],ParameterDirection.Input),
+                    new OracleParameter(":ACCOUNTID",OracleDbType.Int32, row["ACCOUNTID"],ParameterDirection.Input),
+                    new OracleParameter(":CREATETIME",OracleDbType.Date, row["CREATETIME"],ParameterDirection.Input),
+                    new OracleParameter(":UPDATETIME",OracleDbType.Date, row["UPDATETIME"],ParameterDirection.Input),
+                    new OracleParameter(":GOODSLEVELID",OracleDbType.Int32, row["GOODSLEVELID"],ParameterDirection.Input),
+                    new OracleParameter(":GOODSLEVELTYPEID",OracleDbType.Int32, row["GOODSLEVELTYPEID"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGDATE",OracleDbType.Date, row["GROUTINGDATE"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGMOULDCODE",OracleDbType.NVarchar2, row["GROUTINGMOULDCODE"],ParameterDirection.Input),
+                    new OracleParameter(":MOULDCODE",OracleDbType.NVarchar2, row["MOULDCODE"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGUSERID",OracleDbType.Int32, row["GROUTINGUSERID"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGUSERCODE",OracleDbType.NVarchar2, row["GROUTINGUSERCODE"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGNUM",OracleDbType.Decimal, row["GROUTINGNUM"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGDAILYID",OracleDbType.Int32, row["GROUTINGDAILYID"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGDAILYDETAILID",OracleDbType.Int32, row["GROUTINGDAILYDETAILID"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGLINEID",OracleDbType.Int32, row["GROUTINGLINEID"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGLINECODE",OracleDbType.NVarchar2, row["GROUTINGLINECODE"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGLINENAME",OracleDbType.NVarchar2, row["GROUTINGLINENAME"],ParameterDirection.Input),
+                    new OracleParameter(":GMOULDTYPEID",OracleDbType.Int32, row["GMOULDTYPEID"],ParameterDirection.Input),
+                    new OracleParameter(":CANMANYTIMES",OracleDbType.Char, row["CANMANYTIMES"],ParameterDirection.Input),
+                    new OracleParameter(":GROUTINGLINEDETAILID",OracleDbType.Int32, row["GROUTINGLINEDETAILID"],ParameterDirection.Input),
+                    new OracleParameter(":SPECIALREPAIRFLAG",OracleDbType.Char, row["SPECIALREPAIRFLAG"],ParameterDirection.Input),
+                    new OracleParameter(":CLASSESSETTINGID",OracleDbType.Int32, row["CLASSESSETTINGID"],ParameterDirection.Input),
+                    new OracleParameter(":LOGOID",OracleDbType.Int32, row["LOGOID"],ParameterDirection.Input),
+                    new OracleParameter(":BACKOUTTIME",OracleDbType.Date, row["BACKOUTTIME"],ParameterDirection.Input),
+                    new OracleParameter(":BACKOUTUSERID",OracleDbType.Int32, row["BACKOUTUSERID"],ParameterDirection.Input),
+                    new OracleParameter(":BACKOUTUSERCODE",OracleDbType.NVarchar2, row["BACKOUTUSERCODE"],ParameterDirection.Input),
+                    new OracleParameter(":CHECKTIME",OracleDbType.Date, row["CHECKTIME"],ParameterDirection.Input),
                 };
-
                 int returnRows = oracleTrConn.ExecuteNonQuery(sqlString, paras);
                 #endregion
 
@@ -6281,6 +6566,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 // 删除生产数据
                 sqlString = "UPDATE TP_PM_PRODUCTIONDATA\n" +
                             "   SET VALUEFLAG = '0'\n" +
+                            "   , BACKOUTTIME = sysdate\n" +
+                            "   , BACKOUTUSERID = " + sUserInfo.UserID + "\n" +
+                            "   , BACKOUTUSERCODE = '"+ sUserInfo.UserCode+ "'\n" +
                             " WHERE PRODUCTIONDATAID = :PRODUCTIONDATAID";
                 paras = new OracleParameter[]
                 {

IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.0418")]
-[assembly: AssemblyFileVersion("1.0.20.0418")]
+[assembly: AssemblyVersion("1.0.20.0423")]
+[assembly: AssemblyFileVersion("1.0.20.0423")]

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.20.0418")]
-[assembly: AssemblyFileVersion("1.0.20.0418")]
+[assembly: AssemblyVersion("1.0.20.0423")]
+[assembly: AssemblyFileVersion("1.0.20.0423")]