修正商标显示不正确

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -1039,7 +1039,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 									on gdd.BARCODE = TP_PM_ProductionDataIn.BARCODE
 									left join TP_MST_DATADICTIONARY dd on dd.DICTIONARYID = gdd.GLAZETYPEID
                                     left join TP_MST_Logo
-                                    on TP_PM_ProductionDataIn.logoid=TP_MST_Logo.logoid
+                                    on gdd.logoid=TP_MST_Logo.logoid
                                     where 
                                     TP_PM_ProductionDataIn.Productiondataid=:ProductionDataID
                                     ";

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -16573,7 +16573,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
         /// 设置条码商标 釉料
         /// </summary>
         /// <returns></returns>
-        public static int SaveBarCodeLogoAndGlazetype(string barcode, int logoid, int glazetypeid, SUserInfo sUserInfo)
+        public static int SaveBarCodeLogoAndGlazetype(string barcode, int logoid, int glazetypeid,
+            SUserInfo sUserInfo)
         {
             int returnRows = 0;
             IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
@@ -16637,6 +16638,42 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 };
                 returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
 
+                // 变更履历
+                sql =
+                "INSERT INTO TP_PM_LOGOCHANGEDRECORD\n" +
+                "  (BARCODE\n" +
+                "  ,OLDLOGOID\n" +
+                "  ,NEWLOGOID\n" +
+                //"  ,PROCEDUREID\n" +
+                "  ,REMARKS\n" +
+                "  ,ACCOUNTID\n" +
+                "  ,CREATETIME\n" +
+                "  ,CREATEUSERID)\n" +
+                "VALUES\n" +
+                "  (:BARCODE\n" +
+                "  ,:OLDLOGOID\n" +
+                "  ,:NEWLOGOID\n" +
+                //"  ,:PROCEDUREID\n" +
+                "  ,NULL\n" +
+                "  ,:ACCOUNTID\n" +
+                "  ,SYSDATE\n" +
+                "  ,:CREATEUSERID)";
+                Paras = new OracleParameter[] {
+                        new OracleParameter(":OLDLOGOID",OracleDbType.Int32,
+                            dt.Rows[0]["LOGOID"],ParameterDirection.Input),
+                        new OracleParameter(":NEWLOGOID",OracleDbType.Int32,
+                            logoid,ParameterDirection.Input),
+                        //new OracleParameter(":PROCEDUREID",OracleDbType.Int32,
+                        //    pid,ParameterDirection.Input),
+                        new OracleParameter(":ACCOUNTID",OracleDbType.Int32,
+                            sUserInfo.AccountID,ParameterDirection.Input),
+                        new OracleParameter(":CREATEUSERID",OracleDbType.Int32,
+                            sUserInfo.UserID,ParameterDirection.Input),
+                        new OracleParameter(":BARCODE",OracleDbType.Varchar2,
+                            barcode,ParameterDirection.Input)
+                    };
+                returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
+
                 // 1.更新注浆明细
                 sql = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
                 Paras = new OracleParameter[] {
@@ -16651,6 +16688,22 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                     };
                 returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
 
+                // 1.更新在产
+                sql = @"update TP_PM_INPRODUCTION set logoid=:logoid, 
+--glazetypeid =:glazetypeid, 
+updateuserid=:updateuserid where barcode=:barcode";
+                Paras = new OracleParameter[] {
+                    new OracleParameter(":logoid",OracleDbType.Int32,
+                        logoid,ParameterDirection.Input),
+                    //new OracleParameter(":glazetypeid",OracleDbType.Int32,
+                    //    glazetypeid,ParameterDirection.Input),
+                    new OracleParameter(":updateuserid",OracleDbType.Int32,
+                        sUserInfo.UserID,ParameterDirection.Input),
+                    new OracleParameter(":barcode",OracleDbType.Varchar2,
+                        barcode,ParameterDirection.Input)
+                    };
+                returnRows = oracleTrConn.ExecuteNonQuery(sql, Paras);
+
                 oracleTrConn.Commit();
             }
             catch (Exception ex)
@@ -16669,7 +16722,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
         /// 设置条码商标 釉料
         /// </summary>
         /// <returns></returns>
-        public static int SaveBarCodesLogoAndGlazetype(string barcodesstr, int logoid, int glazetypeid, int procedureID, SUserInfo sUserInfo)
+        public static int SaveBarCodesLogoAndGlazetype(string barcodesstr, int logoid, int glazetypeid,
+            int procedureID, SUserInfo sUserInfo)
         {
             int returnRows = 0;
             IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
@@ -16699,8 +16753,34 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 "  ,:Remarks\n" +
                 "  ,:AccountID\n" +
                 "  ,:CreateUserID)";
+
+                // 变更履历
+                string sqllogo =
+                "INSERT INTO TP_PM_LOGOCHANGEDRECORD\n" +
+                "  (BARCODE\n" +
+                "  ,OLDLOGOID\n" +
+                "  ,NEWLOGOID\n" +
+                //"  ,PROCEDUREID\n" +
+                "  ,REMARKS\n" +
+                "  ,ACCOUNTID\n" +
+                "  ,CREATETIME\n" +
+                "  ,CREATEUSERID)\n" +
+                "VALUES\n" +
+                "  (:BARCODE\n" +
+                "  ,:OLDLOGOID\n" +
+                "  ,:NEWLOGOID\n" +
+                //"  ,:PROCEDUREID\n" +
+                "  ,NULL\n" +
+                "  ,:ACCOUNTID\n" +
+                "  ,SYSDATE\n" +
+                "  ,:CREATEUSERID)";
                 string sql2 = "update tp_pm_groutingdailydetail set logoid=:logoid, glazetypeid =:glazetypeid, updateuserid=:updateuserid where barcode=:barcode";
 
+                // 1.更新在产
+                string sqlin = @"update TP_PM_INPRODUCTION set logoid=:logoid, 
+--glazetypeid =:glazetypeid, 
+updateuserid=:updateuserid where barcode=:barcode";
+
                 //xuwei add 2020-01-02
                 string[] barcodes = barcodesstr.Split(',');
 
@@ -16744,6 +16824,23 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
                     oracleTrConn.ExecuteNonQuery(sql1, Paras);
 
+                    // 商标履历
+                    Paras = new OracleParameter[] {
+                        new OracleParameter(":OLDLOGOID",OracleDbType.Int32,
+                            dt.Rows[0]["LOGOID"],ParameterDirection.Input),
+                        new OracleParameter(":NEWLOGOID",OracleDbType.Int32,
+                            logoid,ParameterDirection.Input),
+                        //new OracleParameter(":PROCEDUREID",OracleDbType.Int32,
+                        //    pid,ParameterDirection.Input),
+                        new OracleParameter(":ACCOUNTID",OracleDbType.Int32,
+                            sUserInfo.AccountID,ParameterDirection.Input),
+                        new OracleParameter(":CREATEUSERID",OracleDbType.Int32,
+                            sUserInfo.UserID,ParameterDirection.Input),
+                        new OracleParameter(":BARCODE",OracleDbType.Varchar2,
+                            barcode,ParameterDirection.Input)
+                    };
+                    returnRows += oracleTrConn.ExecuteNonQuery(sqllogo, Paras);
+
                     // 1.更新注浆明细
                     Paras = new OracleParameter[] {
                         new OracleParameter(":logoid",OracleDbType.Int32,
@@ -16756,6 +16853,19 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             barcode,ParameterDirection.Input)
                     };
                     returnRows += oracleTrConn.ExecuteNonQuery(sql2, Paras);
+
+                    // 1.更新在产
+                    Paras = new OracleParameter[] {
+                        new OracleParameter(":logoid",OracleDbType.Int32,
+                            logoid,ParameterDirection.Input),
+                        //new OracleParameter(":glazetypeid",OracleDbType.Int32,
+                        //    glazetypeid,ParameterDirection.Input),
+                        new OracleParameter(":updateuserid",OracleDbType.Int32,
+                            sUserInfo.UserID,ParameterDirection.Input),
+                        new OracleParameter(":barcode",OracleDbType.Varchar2,
+                            barcode,ParameterDirection.Input)
+                    };
+                    returnRows = oracleTrConn.ExecuteNonQuery(sqlin, Paras);
                 }
 
                 oracleTrConn.Commit();

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1594,7 +1594,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 									glaze.DICTIONARYVALUE AS GLAZENAME
                                     from TP_PM_InProduction left join TP_PM_GroutingDailyDetail gdd on gdd.GroutingDailyDetailID = tp_pm_inproduction.GroutingDailyDetailID
                                      left join tp_mst_logo
-                                    on TP_PM_InProduction.logoid=tp_mst_logo.logoid
+                                    on gdd.logoid=tp_mst_logo.logoid
                                     LEFT JOIN TP_MST_GOODS G ON G.GoodsID = tp_pm_inproduction.goodsid 
                                     LEFT JOIN TP_MST_DataDictionary glaze ON glaze.DICTIONARYID = gdd.GLAZETYPEID
 									where TP_PM_InProduction.BarCode=:barcode";